Index: content/public/test/test_file_system_context.cc |
diff --git a/content/public/test/test_file_system_context.cc b/content/public/test/test_file_system_context.cc |
index f577af40d50fd95f8e5750cbf3d1c6aebd3f51c7..8171690b4113af2944f9f793b843bdf8ba677785 100644 |
--- a/content/public/test/test_file_system_context.cc |
+++ b/content/public/test/test_file_system_context.cc |
@@ -8,49 +8,48 @@ |
#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 "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( |
+storage::FileSystemContext* CreateFileSystemContextForTesting( |
quota::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, |
+ 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(), |
+ 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( |
+storage::FileSystemContext* CreateFileSystemContextWithAutoMountersForTesting( |
quota::QuotaManagerProxy* quota_manager_proxy, |
- ScopedVector<fileapi::FileSystemBackend> additional_providers, |
- const std::vector<fileapi::URLRequestAutoMountHandler>& auto_mounters, |
+ 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(), |
+ storage::ExternalMountPoints::CreateRefCounted().get(), |
make_scoped_refptr(new MockSpecialStoragePolicy()).get(), |
quota_manager_proxy, |
additional_providers.Pass(), |
@@ -59,18 +58,18 @@ CreateFileSystemContextWithAutoMountersForTesting( |
CreateAllowFileAccessOptions()); |
} |
-fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting( |
+storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting( |
quota::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(), |
+ 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()); |
} |