| Index: components/sync_driver/glue/browser_thread_model_worker_unittest.cc
|
| diff --git a/components/sync_driver/glue/browser_thread_model_worker_unittest.cc b/components/sync_driver/glue/browser_thread_model_worker_unittest.cc
|
| index 7ad4df15a82108a6b639798e480b08f724e5a590..f7d667092843710ff0db6221cef88b980943761b 100644
|
| --- a/components/sync_driver/glue/browser_thread_model_worker_unittest.cc
|
| +++ b/components/sync_driver/glue/browser_thread_model_worker_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/location.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/test/test_timeouts.h"
|
| #include "base/threading/thread.h"
|
| @@ -50,8 +51,8 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
| syncer::SyncerError DoWork() {
|
| EXPECT_TRUE(db_thread_.task_runner()->BelongsToCurrentThread());
|
| timer_.Stop(); // Stop the failure timer so the test succeeds.
|
| - main_message_loop_.PostTask(FROM_HERE,
|
| - base::MessageLoop::QuitWhenIdleClosure());
|
| + main_message_loop_.task_runner()->PostTask(
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
|
| did_do_work_ = true;
|
| return syncer::SYNCER_OK;
|
| }
|
| @@ -60,8 +61,8 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
| // DoWork is called first.
|
| void Timeout() {
|
| ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread.";
|
| - main_message_loop_.PostTask(FROM_HERE,
|
| - base::MessageLoop::QuitWhenIdleClosure());
|
| + main_message_loop_.task_runner()->PostTask(
|
| + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
|
| }
|
|
|
| protected:
|
| @@ -90,7 +91,7 @@ TEST_F(SyncBrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) {
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE, base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork,
|
| factory()->GetWeakPtr()));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| EXPECT_TRUE(did_do_work());
|
| }
|
|
|
|
|