| Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| index 93dbbc229750b05e7cf33fa76259605224197e50..10715a209d1d13b08eb1d5966a696b791a110fae 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/run_loop.h"
|
| +#include "base/thread_task_runner_handle.h"
|
| #include "chrome/browser/drive/drive_uploader.h"
|
| #include "chrome/browser/drive/fake_drive_service.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
|
| @@ -72,9 +73,9 @@ class ConflictResolverTest : public testing::Test {
|
| fake_drive_service.PassAs<drive::DriveServiceInterface>(),
|
| drive_uploader.Pass(),
|
| NULL,
|
| - base::MessageLoopProxy::current(),
|
| - base::MessageLoopProxy::current(),
|
| - base::MessageLoopProxy::current()));
|
| + base::ThreadTaskRunnerHandle::Get(),
|
| + base::ThreadTaskRunnerHandle::Get(),
|
| + base::ThreadTaskRunnerHandle::Get()));
|
| context_->SetRemoteChangeProcessor(remote_change_processor_.get());
|
|
|
| RegisterSyncableFileSystem();
|
| @@ -82,7 +83,7 @@ class ConflictResolverTest : public testing::Test {
|
| sync_task_manager_.reset(new SyncTaskManager(
|
| base::WeakPtr<SyncTaskManager::Client>(),
|
| 10 /* maximum_background_task */,
|
| - base::MessageLoopProxy::current()));
|
| + base::ThreadTaskRunnerHandle::Get()));
|
| sync_task_manager_->Initialize(SYNC_STATUS_OK);
|
| }
|
|
|
|
|