diff options
Diffstat (limited to 'chrome/browser')
13 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc index fa5b881..3ef3e55 100644 --- a/chrome/browser/devtools/devtools_adb_bridge.cc +++ b/chrome/browser/devtools/devtools_adb_bridge.cc @@ -585,7 +585,7 @@ DevToolsAdbBridge::RefCountedAdbThread::RefCountedAdbThread() { } } -MessageLoop* DevToolsAdbBridge::RefCountedAdbThread::message_loop() { +base::MessageLoop* DevToolsAdbBridge::RefCountedAdbThread::message_loop() { return thread_ ? thread_->message_loop() : NULL; } diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 4fc5c21..5f2c495 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -2173,7 +2173,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, &MediaStreamDevicesControllerBrowserTest::FinishAudioTest, this)); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); } } @@ -2230,7 +2230,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest, &MediaStreamDevicesControllerBrowserTest::FinishVideoTest, this)); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); } } diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 2e95728..a8dda75 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -106,7 +106,7 @@ PrintJobWorker* PrintJob::DetachWorker(PrintJobWorkerOwner* new_owner) { return NULL; } -MessageLoop* PrintJob::message_loop() { +base::MessageLoop* PrintJob::message_loop() { return ui_message_loop_; } diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index 07ae0d8..8a2321f 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc @@ -56,7 +56,7 @@ PrintJobWorker* PrinterQuery::DetachWorker(PrintJobWorkerOwner* new_owner) { return worker_.release(); } -MessageLoop* PrinterQuery::message_loop() { +base::MessageLoop* PrinterQuery::message_loop() { return io_message_loop_; } diff --git a/chrome/browser/speech/extension_api/tts_extension_apitest.cc b/chrome/browser/speech/extension_api/tts_extension_apitest.cc index fcf86b1..e6009be 100644 --- a/chrome/browser/speech/extension_api/tts_extension_apitest.cc +++ b/chrome/browser/speech/extension_api/tts_extension_apitest.cc @@ -63,7 +63,7 @@ class MockTtsPlatformImpl : public TtsPlatformImpl { } void SendEndEventOnSavedUtteranceId() { - MessageLoop::current()->PostDelayedTask( + base::MessageLoop::current()->PostDelayedTask( FROM_HERE, base::Bind( &MockTtsPlatformImpl::SendEvent, ptr_factory_.GetWeakPtr(), diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.cc b/chrome/browser/sync/glue/browser_thread_model_worker.cc index 3d8cfa1..57e4b9d 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker.cc @@ -50,7 +50,7 @@ BrowserThreadModelWorker::~BrowserThreadModelWorker() {} void BrowserThreadModelWorker::RegisterForLoopDestruction() { if (BrowserThread::CurrentlyOn(thread_)) { - MessageLoop::current()->AddDestructionObserver(this); + base::MessageLoop::current()->AddDestructionObserver(this); } else { BrowserThread::PostTask( thread_, FROM_HERE, diff --git a/chrome/browser/sync/glue/generic_change_processor_unittest.cc b/chrome/browser/sync/glue/generic_change_processor_unittest.cc index 6ab8a61..7062c204 100644 --- a/chrome/browser/sync/glue/generic_change_processor_unittest.cc +++ b/chrome/browser/sync/glue/generic_change_processor_unittest.cc @@ -70,7 +70,7 @@ class GenericChangeProcessorTest : public testing::Test { } private: - MessageLoop loop; + base::MessageLoop loop; syncer::SyncMergeResult sync_merge_result_; base::WeakPtrFactory<syncer::SyncMergeResult> merge_result_ptr_factory_; diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc index 205bb6c..656781a 100644 --- a/chrome/browser/sync/glue/history_model_worker.cc +++ b/chrome/browser/sync/glue/history_model_worker.cc @@ -48,7 +48,7 @@ class AddDBThreadObserverTask : public history::HistoryDBTask { virtual bool RunOnDBThread(history::HistoryBackend* backend, history::HistoryDatabase* db) OVERRIDE { - MessageLoop::current()->AddDestructionObserver(history_worker_.get()); + base::MessageLoop::current()->AddDestructionObserver(history_worker_.get()); return true; } diff --git a/chrome/browser/sync/glue/password_model_worker.cc b/chrome/browser/sync/glue/password_model_worker.cc index 7ee1ea4..ae5ac5c 100644 --- a/chrome/browser/sync/glue/password_model_worker.cc +++ b/chrome/browser/sync/glue/password_model_worker.cc @@ -55,7 +55,7 @@ void PasswordModelWorker::CallDoWorkAndSignalTask( } void PasswordModelWorker::RegisterForPasswordLoopDestruction() { - MessageLoop::current()->AddDestructionObserver(this); + base::MessageLoop::current()->AddDestructionObserver(this); } } // namespace browser_sync diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc index c9de1e8..1105c97 100644 --- a/chrome/browser/sync/glue/ui_model_worker.cc +++ b/chrome/browser/sync/glue/ui_model_worker.cc @@ -79,7 +79,7 @@ void UIModelWorker::Stop() { void UIModelWorker::RegisterForLoopDestruction() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - MessageLoop::current()->AddDestructionObserver(this); + base::MessageLoop::current()->AddDestructionObserver(this); } syncer::SyncerError UIModelWorker::DoWorkAndWaitUntilDoneImpl( diff --git a/chrome/browser/ui/app_list/search/history_data_store_unittest.cc b/chrome/browser/ui/app_list/search/history_data_store_unittest.cc index d1ed8d1..46b7643 100644 --- a/chrome/browser/ui/app_list/search/history_data_store_unittest.cc +++ b/chrome/browser/ui/app_list/search/history_data_store_unittest.cc @@ -91,7 +91,7 @@ class HistoryDataStoreTest : public testing::Test { run_loop_->Quit(); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; base::ScopedTempDir temp_dir_; base::FilePath data_file_; diff --git a/chrome/browser/ui/app_list/search/history_unittest.cc b/chrome/browser/ui/app_list/search/history_unittest.cc index b7892c4..72a3a6c 100644 --- a/chrome/browser/ui/app_list/search/history_unittest.cc +++ b/chrome/browser/ui/app_list/search/history_unittest.cc @@ -158,7 +158,7 @@ class SearchHistoryTest : public testing::Test { } private: - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; content::TestBrowserThread ui_thread_; scoped_ptr<TestingProfile> profile_; diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 0a87c080..ce95355 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -97,7 +97,7 @@ std::string ThemeSource::GetMimeType(const std::string& path) const { return "image/png"; } -MessageLoop* ThemeSource::MessageLoopForRequestPath( +base::MessageLoop* ThemeSource::MessageLoopForRequestPath( const std::string& path) const { std::string uncached_path; webui::ParsePathAndScale(GURL(GetThemePath() + path), &uncached_path, NULL); |