| 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 7f602507ddd173a58ba7c9c54b81f87ea1848718..d44765be1f6868abff4e7f56dad35436f91e6977 100644
|
| --- a/content/public/test/test_file_system_context.cc
|
| +++ b/content/public/test/test_file_system_context.cc
|
| @@ -5,7 +5,6 @@
|
| #include "content/public/test/test_file_system_context.h"
|
|
|
| #include "base/memory/scoped_vector.h"
|
| -#include "base/thread_task_runner_handle.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"
|
| @@ -20,7 +19,7 @@ storage::FileSystemContext* CreateFileSystemContextForTesting(
|
| const base::FilePath& base_path) {
|
| ScopedVector<storage::FileSystemBackend> additional_providers;
|
| additional_providers.push_back(new TestFileSystemBackend(
|
| - base::ThreadTaskRunnerHandle::Get().get(), base_path));
|
| + base::MessageLoopProxy::current().get(), base_path));
|
| return CreateFileSystemContextWithAdditionalProvidersForTesting(
|
| quota_manager_proxy, additional_providers.Pass(), base_path);
|
| }
|
| @@ -31,12 +30,14 @@ CreateFileSystemContextWithAdditionalProvidersForTesting(
|
| ScopedVector<storage::FileSystemBackend> additional_providers,
|
| const base::FilePath& base_path) {
|
| return new storage::FileSystemContext(
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| storage::ExternalMountPoints::CreateRefCounted().get(),
|
| make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
|
| - quota_manager_proxy, additional_providers.Pass(),
|
| - std::vector<storage::URLRequestAutoMountHandler>(), base_path,
|
| + quota_manager_proxy,
|
| + additional_providers.Pass(),
|
| + std::vector<storage::URLRequestAutoMountHandler>(),
|
| + base_path,
|
| CreateAllowFileAccessOptions());
|
| }
|
|
|
| @@ -46,12 +47,15 @@ storage::FileSystemContext* CreateFileSystemContextWithAutoMountersForTesting(
|
| const std::vector<storage::URLRequestAutoMountHandler>& auto_mounters,
|
| const base::FilePath& base_path) {
|
| return new storage::FileSystemContext(
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| storage::ExternalMountPoints::CreateRefCounted().get(),
|
| make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
|
| - quota_manager_proxy, additional_providers.Pass(), auto_mounters,
|
| - base_path, CreateAllowFileAccessOptions());
|
| + quota_manager_proxy,
|
| + additional_providers.Pass(),
|
| + auto_mounters,
|
| + base_path,
|
| + CreateAllowFileAccessOptions());
|
| }
|
|
|
| storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
|
| @@ -59,12 +63,14 @@ storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
|
| const base::FilePath& base_path) {
|
| ScopedVector<storage::FileSystemBackend> additional_providers;
|
| return new storage::FileSystemContext(
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| - base::ThreadTaskRunnerHandle::Get().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| + base::MessageLoopProxy::current().get(),
|
| storage::ExternalMountPoints::CreateRefCounted().get(),
|
| make_scoped_refptr(new MockSpecialStoragePolicy()).get(),
|
| - quota_manager_proxy, additional_providers.Pass(),
|
| - std::vector<storage::URLRequestAutoMountHandler>(), base_path,
|
| + quota_manager_proxy,
|
| + additional_providers.Pass(),
|
| + std::vector<storage::URLRequestAutoMountHandler>(),
|
| + base_path,
|
| CreateIncognitoFileSystemOptions());
|
| }
|
|
|
|
|