| Index: content/public/test/test_file_system_context.h
|
| diff --git a/content/public/test/test_file_system_context.h b/content/public/test/test_file_system_context.h
|
| index 8b7c872b87e7999f41028365fa4c2be0fda58670..068fa8109d7a8672786710245b93cee9d7b99537 100644
|
| --- a/content/public/test/test_file_system_context.h
|
| +++ b/content/public/test/test_file_system_context.h
|
| @@ -7,39 +7,38 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "webkit/browser/fileapi/file_system_context.h"
|
| +#include "storage/browser/fileapi/file_system_context.h"
|
|
|
| namespace quota {
|
| class QuotaManagerProxy;
|
| class SpecialStoragePolicy;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| class FileSystemBackend;
|
| }
|
|
|
| namespace content {
|
|
|
| -fileapi::FileSystemContext* CreateFileSystemContextForTesting(
|
| +storage::FileSystemContext* CreateFileSystemContextForTesting(
|
| quota::QuotaManagerProxy* quota_manager_proxy,
|
| const base::FilePath& base_path);
|
|
|
| // The caller is responsible for including TestFileSystemBackend in
|
| // |additional_providers| if needed.
|
| -fileapi::FileSystemContext*
|
| -CreateFileSystemContextWithAdditionalProvidersForTesting(
|
| - quota::QuotaManagerProxy* quota_manager_proxy,
|
| - ScopedVector<fileapi::FileSystemBackend> additional_providers,
|
| - const base::FilePath& base_path);
|
| +storage::FileSystemContext*
|
| + CreateFileSystemContextWithAdditionalProvidersForTesting(
|
| + quota::QuotaManagerProxy* quota_manager_proxy,
|
| + ScopedVector<storage::FileSystemBackend> additional_providers,
|
| + const base::FilePath& base_path);
|
|
|
| -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);
|
|
|
| -fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
|
| +storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
|
| quota::QuotaManagerProxy* quota_manager_proxy,
|
| const base::FilePath& base_path);
|
|
|
|
|