Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / public / test / test_file_system_context.cc

diff --git a/src/content/public/test/test_file_system_context.cc b/src/content/public/test/test_file_system_context.cc
index aa954de..d44765b 100644 (file)
--- a/src/content/public/test/test_file_system_context.cc
+++ b/src/content/public/test/test_file_system_context.cc
@@ -5,53 +5,52 @@
 #include "content/public/test/test_file_system_context.h"
 
 #include "base/memory/scoped_vector.h"
+#include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_file_system_backend.h"
 #include "content/public/test/test_file_system_options.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"
-#include "webkit/browser/quota/mock_special_storage_policy.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
 namespace content {
 
-fileapi::FileSystemContext* CreateFileSystemContextForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
+storage::FileSystemContext* CreateFileSystemContextForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
     const base::FilePath& base_path) {
-  ScopedVector<fileapi::FileSystemBackend> additional_providers;
+  ScopedVector<storage::FileSystemBackend> additional_providers;
   additional_providers.push_back(new TestFileSystemBackend(
       base::MessageLoopProxy::current().get(), base_path));
   return CreateFileSystemContextWithAdditionalProvidersForTesting(
       quota_manager_proxy, additional_providers.Pass(), base_path);
 }
 
-fileapi::FileSystemContext*
+storage::FileSystemContext*
 CreateFileSystemContextWithAdditionalProvidersForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
-    ScopedVector<fileapi::FileSystemBackend> additional_providers,
+    storage::QuotaManagerProxy* quota_manager_proxy,
+    ScopedVector<storage::FileSystemBackend> additional_providers,
     const base::FilePath& base_path) {
-  return new fileapi::FileSystemContext(
+  return new storage::FileSystemContext(
       base::MessageLoopProxy::current().get(),
       base::MessageLoopProxy::current().get(),
-      fileapi::ExternalMountPoints::CreateRefCounted().get(),
-      make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(),
+      storage::ExternalMountPoints::CreateRefCounted().get(),
+      make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
       quota_manager_proxy,
       additional_providers.Pass(),
-      std::vector<fileapi::URLRequestAutoMountHandler>(),
+      std::vector<storage::URLRequestAutoMountHandler>(),
       base_path,
       CreateAllowFileAccessOptions());
 }
 
-fileapi::FileSystemContext*
-CreateFileSystemContextWithAutoMountersForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
-    ScopedVector<fileapi::FileSystemBackend> additional_providers,
-    const std::vector<fileapi::URLRequestAutoMountHandler>& auto_mounters,
+storage::FileSystemContext* CreateFileSystemContextWithAutoMountersForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
+    ScopedVector<storage::FileSystemBackend> additional_providers,
+    const std::vector<storage::URLRequestAutoMountHandler>& auto_mounters,
     const base::FilePath& base_path) {
-  return new fileapi::FileSystemContext(
+  return new storage::FileSystemContext(
       base::MessageLoopProxy::current().get(),
       base::MessageLoopProxy::current().get(),
-      fileapi::ExternalMountPoints::CreateRefCounted().get(),
-      make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(),
+      storage::ExternalMountPoints::CreateRefCounted().get(),
+      make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
       quota_manager_proxy,
       additional_providers.Pass(),
       auto_mounters,
@@ -59,18 +58,18 @@ CreateFileSystemContextWithAutoMountersForTesting(
       CreateAllowFileAccessOptions());
 }
 
-fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
+storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
     const base::FilePath& base_path) {
-  ScopedVector<fileapi::FileSystemBackend> additional_providers;
-  return new fileapi::FileSystemContext(
+  ScopedVector<storage::FileSystemBackend> additional_providers;
+  return new storage::FileSystemContext(
       base::MessageLoopProxy::current().get(),
       base::MessageLoopProxy::current().get(),
-      fileapi::ExternalMountPoints::CreateRefCounted().get(),
-      make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(),
+      storage::ExternalMountPoints::CreateRefCounted().get(),
+      make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
       quota_manager_proxy,
       additional_providers.Pass(),
-      std::vector<fileapi::URLRequestAutoMountHandler>(),
+      std::vector<storage::URLRequestAutoMountHandler>(),
       base_path,
       CreateIncognitoFileSystemOptions());
 }