diff options
Diffstat (limited to 'sync')
-rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 2 | ||||
-rw-r--r-- | sync/internal_api/public/engine/model_safe_worker.h | 2 | ||||
-rw-r--r-- | sync/test/accounts_client/test_accounts_client.cc | 4 | ||||
-rw-r--r-- | sync/test/accounts_client/test_accounts_client.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 3820102..75f5418 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -1293,7 +1293,7 @@ TEST_F(SyncSchedulerTest, ConnectionChangeCanaryPreemptedByNudge) { connection()->SetServerReachable(); connection()->UpdateConnectionStatus(); scheduler()->ScheduleLocalNudge(zero(), ModelTypeSet(BOOKMARKS), FROM_HERE); - MessageLoop::current()->RunUntilIdle(); + base::MessageLoop::current()->RunUntilIdle(); } // Tests that we don't crash trying to run two canaries at once if we receive diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h index 94925df..aedf649 100644 --- a/sync/internal_api/public/engine/model_safe_worker.h +++ b/sync/internal_api/public/engine/model_safe_worker.h @@ -66,7 +66,7 @@ class WorkerLoopDestructionObserver { // work and will notify its observer. class SYNC_EXPORT ModelSafeWorker : public base::RefCountedThreadSafe<ModelSafeWorker>, - public MessageLoop::DestructionObserver { + public base::MessageLoop::DestructionObserver { public: // Subclass should implement to observe destruction of the loop where // it actually does work. diff --git a/sync/test/accounts_client/test_accounts_client.cc b/sync/test/accounts_client/test_accounts_client.cc index 82e7af2..8257691 100644 --- a/sync/test/accounts_client/test_accounts_client.cc +++ b/sync/test/accounts_client/test_accounts_client.cc @@ -135,7 +135,7 @@ GURL TestAccountsClient::CreateGURLWithPath(const string& path) { bool TestAccountsClient::SendRequest(const GURL& url, string* response) { - MessageLoop* loop = MessageLoop::current(); + base::MessageLoop* loop = base::MessageLoop::current(); scoped_refptr<URLRequestContextGetter> context_getter( new URLRequestContextGetter(loop->message_loop_proxy())); @@ -148,7 +148,7 @@ bool TestAccountsClient::SendRequest(const GURL& url, string* response) { fetcher->SetUploadData("application/json", ""); fetcher->Start(); - MessageLoop::current()->PostDelayedTask(FROM_HERE, + base::MessageLoop::current()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(), kRequestTimeout); run_loop.Run(); diff --git a/sync/test/accounts_client/test_accounts_client.h b/sync/test/accounts_client/test_accounts_client.h index cade734..5c98642 100644 --- a/sync/test/accounts_client/test_accounts_client.h +++ b/sync/test/accounts_client/test_accounts_client.h @@ -54,7 +54,7 @@ class TestAccountsClient { private: GURL CreateGURLWithPath(const string& path); - MessageLoopForIO io_loop_; + base::MessageLoopForIO io_loop_; const string server_; const string account_space_; vector<string> usernames_; |