Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / local / canned_syncable_file_system.cc

diff --git a/src/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/src/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
index 12e9470..9608013 100644 (file)
--- a/src/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
+++ b/src/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -21,9 +21,9 @@
 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
+#include "content/public/test/mock_blob_url_request_context.h"
 #include "content/public/test/test_file_system_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/blob/mock_blob_url_request_context.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
@@ -39,8 +39,8 @@ using fileapi::FileSystemOperationRunner;
 using fileapi::FileSystemURL;
 using fileapi::FileSystemURLSet;
 using quota::QuotaManager;
-using webkit_blob::MockBlobURLRequestContext;
-using webkit_blob::ScopedTextBlob;
+using content::MockBlobURLRequestContext;
+using content::ScopedTextBlob;
 
 namespace sync_file_system {
 
@@ -205,12 +205,14 @@ void EnsureLastTaskRuns(base::SingleThreadTaskRunner* runner) {
 
 CannedSyncableFileSystem::CannedSyncableFileSystem(
     const GURL& origin,
+    leveldb::Env* env_override,
     base::SingleThreadTaskRunner* io_task_runner,
     base::SingleThreadTaskRunner* file_task_runner)
     : origin_(origin),
       type_(fileapi::kFileSystemTypeSyncable),
       result_(base::File::FILE_OK),
       sync_status_(sync_file_system::SYNC_STATUS_OK),
+      env_override_(env_override),
       io_task_runner_(io_task_runner),
       file_task_runner_(file_task_runner),
       is_filesystem_set_up_(false),
@@ -220,24 +222,27 @@ CannedSyncableFileSystem::CannedSyncableFileSystem(
 
 CannedSyncableFileSystem::~CannedSyncableFileSystem() {}
 
-void CannedSyncableFileSystem::SetUp() {
+void CannedSyncableFileSystem::SetUp(QuotaMode quota_mode) {
   ASSERT_FALSE(is_filesystem_set_up_);
   ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
 
   scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
       new quota::MockSpecialStoragePolicy();
 
-  quota_manager_ = new QuotaManager(false /* is_incognito */,
-                                    data_dir_.path(),
-                                    io_task_runner_.get(),
-                                    base::MessageLoopProxy::current().get(),
-                                    storage_policy.get());
+  if (quota_mode == QUOTA_ENABLED) {
+    quota_manager_ = new QuotaManager(false /* is_incognito */,
+                                      data_dir_.path(),
+                                      io_task_runner_.get(),
+                                      base::MessageLoopProxy::current().get(),
+                                      storage_policy.get());
+  }
 
   std::vector<std::string> additional_allowed_schemes;
   additional_allowed_schemes.push_back(origin_.scheme());
   fileapi::FileSystemOptions options(
       fileapi::FileSystemOptions::PROFILE_MODE_NORMAL,
-      additional_allowed_schemes);
+      additional_allowed_schemes,
+      env_override_);
 
   ScopedVector<fileapi::FileSystemBackend> additional_backends;
   additional_backends.push_back(SyncFileSystemBackend::CreateForTesting());
@@ -247,7 +252,7 @@ void CannedSyncableFileSystem::SetUp() {
       file_task_runner_.get(),
       fileapi::ExternalMountPoints::CreateRefCounted().get(),
       storage_policy.get(),
-      quota_manager_->proxy(),
+      quota_manager_ ? quota_manager_->proxy() : NULL,
       additional_backends.Pass(),
       data_dir_.path(), options);
 
@@ -705,6 +710,7 @@ void CannedSyncableFileSystem::DoGetUsageAndQuota(
     const quota::StatusCallback& callback) {
   EXPECT_TRUE(io_task_runner_->RunsTasksOnCurrentThread());
   EXPECT_TRUE(is_filesystem_opened_);
+  DCHECK(quota_manager_);
   quota_manager_->GetUsageAndQuota(
       origin_, storage_type(),
       base::Bind(&DidGetUsageAndQuota, callback, usage, quota));