summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi/file_system_context_unittest.cc
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-06-05 10:48:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-05 17:49:39 +0000
commitd4104aab631ebbf2b13ad881b3ccc00a4c4b797c (patch)
treee7ae9d8767f554877496c3527ad833a5b8018b66 /content/browser/fileapi/file_system_context_unittest.cc
parenta73bdd5538ce40dd9e3a664ed5c42b2618f04d01 (diff)
downloadchromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.zip
chromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.tar.gz
chromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.tar.bz2
Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"
This reverts commit 422456f9d53f0bf936a64f21a1463fd0abd3df84. TBR=zea@chromium.org BUG=465354 NOTRY=true NOTREECHECKS=true Review URL: https://codereview.chromium.org/1170623003 Cr-Commit-Position: refs/heads/master@{#333086}
Diffstat (limited to 'content/browser/fileapi/file_system_context_unittest.cc')
-rw-r--r--content/browser/fileapi/file_system_context_unittest.cc23
1 files changed, 14 insertions, 9 deletions
diff --git a/content/browser/fileapi/file_system_context_unittest.cc b/content/browser/fileapi/file_system_context_unittest.cc
index b1ffb63..c071c4b 100644
--- a/content/browser/fileapi/file_system_context_unittest.cc
+++ b/content/browser/fileapi/file_system_context_unittest.cc
@@ -5,8 +5,8 @@
#include "storage/browser/fileapi/file_system_context.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/message_loop/message_loop.h"
#include "base/strings/stringprintf.h"
-#include "base/thread_task_runner_handle.h"
#include "content/browser/quota/mock_quota_manager.h"
#include "content/public/test/mock_special_storage_policy.h"
#include "content/public/test/test_file_system_options.h"
@@ -54,21 +54,26 @@ class FileSystemContextTest : public testing::Test {
storage_policy_ = new MockSpecialStoragePolicy();
- mock_quota_manager_ = new MockQuotaManager(
- false /* is_incognito */, data_dir_.path(),
- base::ThreadTaskRunnerHandle::Get().get(),
- base::ThreadTaskRunnerHandle::Get().get(), storage_policy_.get());
+ mock_quota_manager_ =
+ new MockQuotaManager(false /* is_incognito */,
+ data_dir_.path(),
+ base::MessageLoopProxy::current().get(),
+ base::MessageLoopProxy::current().get(),
+ storage_policy_.get());
}
protected:
FileSystemContext* CreateFileSystemContextForTest(
storage::ExternalMountPoints* external_mount_points) {
return new FileSystemContext(
- base::ThreadTaskRunnerHandle::Get().get(),
- base::ThreadTaskRunnerHandle::Get().get(), external_mount_points,
- storage_policy_.get(), mock_quota_manager_->proxy(),
+ base::MessageLoopProxy::current().get(),
+ base::MessageLoopProxy::current().get(),
+ external_mount_points,
+ storage_policy_.get(),
+ mock_quota_manager_->proxy(),
ScopedVector<FileSystemBackend>(),
- std::vector<storage::URLRequestAutoMountHandler>(), data_dir_.path(),
+ std::vector<storage::URLRequestAutoMountHandler>(),
+ data_dir_.path(),
CreateAllowFileAccessOptions());
}