diff options
52 files changed, 85 insertions, 85 deletions
diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc index 2a17ba8..bdf729c 100644 --- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc @@ -99,7 +99,7 @@ class HistoryContentsProviderTest : public testing::Test, // We must quit the message loop (if running) to return control to the test. // Note, calling Quit() directly will checkfail if the loop isn't running, // so we post a task, which is safe for either case. - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } MessageLoopForUI message_loop_; diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc index 65323fb..630b1eb 100644 --- a/chrome/browser/autofill/personal_data_manager_unittest.cc +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc @@ -66,7 +66,7 @@ class PersonalDataManagerTest : public testing::Test { profile_.reset(NULL); db_thread_.Stop(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 629ca09..6368b05 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) { // It seems we have to wait a little bit for the widgets to spin up before // we can start clicking on them. MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), + MessageLoop::QuitClosure(), kActionDelayMs); ui_test_utils::RunMessageLoop(); #endif // defined(OS_POSIX) @@ -589,7 +589,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { interstitial_page->Show(); // Give some time for the interstitial to show. MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), + MessageLoop::QuitClosure(), 1000); ui_test_utils::RunMessageLoop(); @@ -715,7 +715,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { interstitial_page->Show(); // Give some time for the interstitial to show. MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), + MessageLoop::QuitClosure(), 1000); ui_test_utils::RunMessageLoop(); @@ -763,7 +763,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // - creating a factory used to create the delegate // - making the test a private and overwriting the delegate member directly. MessageLoop::current()->PostDelayedTask( - FROM_HERE, new MessageLoop::QuitTask(), kActionDelayMs); + FROM_HERE, MessageLoop::QuitClosure(), kActionDelayMs); ui_test_utils::RunMessageLoop(); ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); @@ -796,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // See remark above on why we wait. MessageLoop::current()->PostDelayedTask( - FROM_HERE, new MessageLoop::QuitTask(), kActionDelayMs); + FROM_HERE, MessageLoop::QuitClosure(), kActionDelayMs); ui_test_utils::RunMessageLoop(); ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); } diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 4d13782..50e2a95 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -309,7 +309,7 @@ void BrowserProcessImpl::PostStopThread(BrowserThread::ID thread_id) { // send the QuitTask that terminated the message loop. static void PostQuit(MessageLoop* message_loop) { g_end_session_file_thread_has_completed = true; - message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } #elif defined(USE_X11) static void Signal(base::WaitableEvent* event) { @@ -392,7 +392,7 @@ void BrowserProcessImpl::EndSession() { } while (!g_end_session_file_thread_has_completed); // If we did get extra quits, then we should re-post them to the message loop. while (--quits_received > 0) - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); #else NOTIMPLEMENTED(); #endif diff --git a/chrome/browser/chromeos/login/mock_authenticator.cc b/chrome/browser/chromeos/login/mock_authenticator.cc index 1bf6807..4f1b1d40 100644 --- a/chrome/browser/chromeos/login/mock_authenticator.cc +++ b/chrome/browser/chromeos/login/mock_authenticator.cc @@ -59,7 +59,7 @@ void MockAuthenticator::OnLoginFailure(const LoginFailure& failure) { consumer_->OnLoginFailure(failure); VLOG(1) << "Posting a QuitTask to UI thread"; BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc index e7debdb..b04283b 100644 --- a/chrome/browser/chromeos/login/online_attempt_unittest.cc +++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc @@ -88,7 +88,7 @@ class OnlineAttemptTest : public testing::Test { static void Quit() { BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask()); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } static void RunThreadTest() { diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index cb49c5f..a5a6690 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -640,7 +640,7 @@ TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestOSRegistrationFailure) { static void MakeRequest(const GURL& url, ProtocolHandlerRegistry* registry) { net::URLRequest request(url, NULL); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); scoped_refptr<net::URLRequestJob> job(registry->MaybeCreateJob(&request)); ASSERT_TRUE(job.get() != NULL); } @@ -658,7 +658,7 @@ TEST_F(ProtocolHandlerRegistryTest, TestMaybeCreateTaskWorksFromIOThread) { static void CheckIsHandled(const std::string& scheme, bool expected, ProtocolHandlerRegistry* registry) { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); ASSERT_EQ(expected, registry->IsHandledProtocolIO(scheme)); } @@ -724,7 +724,7 @@ TEST_F(ProtocolHandlerRegistryTest, TestClearDefaultGetsPropagatedToIO) { static void QuitUILoop() { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } TEST_F(ProtocolHandlerRegistryTest, TestLoadEnabledGetsPropogatedToIO) { diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 467e735..03d60c5 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -283,7 +283,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { worker_data_->worker_route_id = instance.worker_route_id(); WorkerService::GetInstance()->RemoveObserver(this); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask); + MessageLoop::QuitClosure()); delete this; } virtual void WorkerDestroyed( @@ -314,7 +314,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { ASSERT_EQ(worker_data_->worker_route_id, worker_route_id); WorkerService::GetInstance()->RemoveObserver(this); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask); + MessageLoop::QuitClosure()); delete this; } virtual void WorkerContextStarted( @@ -368,7 +368,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { worker_data->worker_process_id = worker->id(); worker_data->worker_route_id = i->worker_route_id(); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask); + MessageLoop::QuitClosure()); return; } } diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index b56b452..ad108cd 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -132,7 +132,7 @@ class CancelTestDataCollector void FileInfoCollector() { dfm_pending_downloads_ = download_file_manager_->NumberOfActiveDownloads(); BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask()); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } ResourceDispatcherHost* resource_dispatcher_host_; diff --git a/chrome/browser/download/download_test_observer.cc b/chrome/browser/download/download_test_observer.cc index 535dbfc..4fea66c 100644 --- a/chrome/browser/download/download_test_observer.cc +++ b/chrome/browser/download/download_test_observer.cc @@ -297,6 +297,6 @@ void DownloadTestFlushObserver::PingIOThread(int cycle) { cycle)); } else { BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask()); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } } diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index c9fc7e7..8777048 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -93,7 +93,7 @@ class AppNotificationManagerSyncTest : public testing::Test { static void PostQuitToUIThread() { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } static void WaitForFileThread() { diff --git a/chrome/browser/extensions/app_notification_manager_unittest.cc b/chrome/browser/extensions/app_notification_manager_unittest.cc index feb5cc9..4e550d6 100644 --- a/chrome/browser/extensions/app_notification_manager_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_unittest.cc @@ -54,7 +54,7 @@ class AppNotificationManagerTest : public testing::Test { static void PostQuitToUIThread() { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } static void WaitForFileThread() { diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index ef6a172..bdea847 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -91,7 +91,7 @@ TEST_F(UserScriptMasterTest, NoScripts) { TestingProfile profile; scoped_refptr<UserScriptMaster> master(new UserScriptMaster(&profile)); master->StartLoad(); - message_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask); + message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure()); message_loop_.Run(); ASSERT_TRUE(shared_memory_ != NULL); diff --git a/chrome/browser/fast_shutdown_uitest.cc b/chrome/browser/fast_shutdown_uitest.cc index 137a6e7..32f448f 100644 --- a/chrome/browser/fast_shutdown_uitest.cc +++ b/chrome/browser/fast_shutdown_uitest.cc @@ -70,7 +70,7 @@ class FastShutdown : public UITest { std::vector<net::CookieMonster::CanonicalCookie*>* cookies, const std::vector<net::CookieMonster::CanonicalCookie*>& cookies_get) { *cookies = cookies_get; - to_notify->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + to_notify->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } content::TestBrowserThread db_thread_; diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc index 8f21c21..22729d5 100644 --- a/chrome/browser/geolocation/access_token_store_browsertest.cc +++ b/chrome/browser/geolocation/access_token_store_browsertest.cc @@ -95,7 +95,7 @@ void RunCancelTestInClientTread() { EXPECT_EQ(0u, consumer.PendingRequestCount()); BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } void GeolocationAccessTokenStoreTest::DoTestStepAndWaitForResults( @@ -135,7 +135,7 @@ void GeolocationAccessTokenStoreTest::OnAccessTokenStoresLoaded( store->SaveAccessToken(ref_url_, *token_to_set_); } BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask); + BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure()); } IN_PROC_BROWSER_TEST_F(GeolocationAccessTokenStoreTest, SetAcrossInstances) { diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 3dfc370..272dbbb 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -69,7 +69,7 @@ class HistoryEnumerator : public HistoryService::URLEnumerator { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } std::vector<GURL>& urls() { return urls_; } diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc index f25b802..3957064 100644 --- a/chrome/browser/intents/web_intents_registry_unittest.cc +++ b/chrome/browser/intents/web_intents_registry_unittest.cc @@ -98,7 +98,7 @@ class WebIntentsRegistryTest : public testing::Test { wds_->Shutdown(); db_thread_.Stop(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 3540990..cbdf156 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -194,7 +194,7 @@ TEST_F(ConnectionTesterTest, DeleteWhileInProgress) { // |backup_task| that it will try to deref during the destructor, but // depending on the order that pending tasks were deleted in, it might // already be invalid! See http://crbug.com/43291. - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/net/gaia/token_service_unittest.cc b/chrome/browser/net/gaia/token_service_unittest.cc index 7ac4473..c43cd5c 100644 --- a/chrome/browser/net/gaia/token_service_unittest.cc +++ b/chrome/browser/net/gaia/token_service_unittest.cc @@ -89,7 +89,7 @@ void TokenServiceTestHarness::TearDown() { } db_thread_.Stop(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 6e4e90c..e9758f1 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -128,7 +128,7 @@ TEST_F(PredictorTest, ShutdownWhenResolutionIsPendingTest) { testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED); MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 500); + MessageLoop::QuitClosure(), 500); MessageLoop::current()->Run(); EXPECT_FALSE(testing_master.WasFound(localhost)); diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index ec57fcd..6f2f8c1 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -307,7 +307,7 @@ class NativeBackendGnomeTest : public testing::Test { } virtual void TearDown() { - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); db_thread_.Stop(); } @@ -324,7 +324,7 @@ class NativeBackendGnomeTest : public testing::Test { } static void PostQuitTask(MessageLoop* loop) { - loop->PostTask(FROM_HERE, new MessageLoop::QuitTask); + loop->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } void CheckUint32Attribute(const MockKeyringItem* item, diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 9deec48..75bda2f 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -254,7 +254,7 @@ void NativeBackendKWalletTest::SetUp() { } void NativeBackendKWalletTest::TearDown() { - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); db_thread_.Stop(); } diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index d818d94..cbb22bb 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -124,7 +124,7 @@ class PasswordStoreDefaultTest : public testing::Test { virtual void TearDown() { wds_->Shutdown(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); db_thread_.Stop(); } diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index dd49063..7061ca4 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/chrome/browser/password_manager/password_store_mac_unittest.cc @@ -915,7 +915,7 @@ class PasswordStoreMacTest : public testing::Test { virtual void TearDown() { store_->Shutdown(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 774ea3f..09e6d96 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -120,7 +120,7 @@ class PasswordStoreWinTest : public testing::Test { virtual void TearDown() { if (wds_.get()) wds_->Shutdown(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); db_thread_.Stop(); } diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index e616693..ad33db6 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -298,7 +298,7 @@ class PasswordStoreXTest : public testing::TestWithParam<BackendType> { virtual void TearDown() { wds_->Shutdown(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); db_thread_.Stop(); } diff --git a/chrome/browser/plugin_test.cc b/chrome/browser/plugin_test.cc index ddb36b3..afc1458 100644 --- a/chrome/browser/plugin_test.cc +++ b/chrome/browser/plugin_test.cc @@ -298,7 +298,7 @@ class PluginInstallerDownloadTest context_getter->GetIOMessageLoopProxy()); MessageLoop::current()->PostDelayedTask( - FROM_HERE, new MessageLoop::QuitTask, + FROM_HERE, MessageLoop::QuitClosure(), TestTimeouts::action_max_timeout_ms()); } diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc index 7cefce7..25543e4 100644 --- a/chrome/browser/prefs/pref_member_unittest.cc +++ b/chrome/browser/prefs/pref_member_unittest.cc @@ -61,7 +61,7 @@ class GetPrefValueCallback void GetPrefValueOnIOThread() { value_ = pref_.GetValue(); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } BooleanPrefMember pref_; diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index 37f9992..f434d8f 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -154,7 +154,7 @@ class PrintDialogCloudTest : public InProcessBrowserTest { virtual void OnResponseCompleted(net::URLRequest* request) { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } }; diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 59beabd..e6275d2 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -141,7 +141,7 @@ void QuitUIMessageLoopFromIO() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } } // namespace diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index 67fdb68..256ec05 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -122,7 +122,7 @@ void QuitUIMessageLoop() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } // Lets us provide a MockURLRequestContext with an HTTP Cache we pre-populate. diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc index c47142f..aeaf4d7 100644 --- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc +++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc @@ -138,7 +138,7 @@ void TestGetInstallState::DoInstallStateTests() { } // All done. - main_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + main_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } void TestGetInstallState::VerifyInstallState( diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index d82be6a..f269b85 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -80,13 +80,13 @@ class ServiceProcessControlBrowserTest // Quit the current message. Post a QuitTask instead of just calling Quit() // because this can get invoked in the context of a Launch() call and we // may not be in Run() yet. - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } void ProcessControlLaunchFailed() { ADD_FAILURE(); // Quit the current message. - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } private: @@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchTwice) { static void DecrementUntilZero(int* count) { (*count)--; if (!(*count)) - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } // Invoke multiple Launch calls in succession and ensure that all the tasks diff --git a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc index a4994a4..b3916c0 100644 --- a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc +++ b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc @@ -99,14 +99,14 @@ class SpeechInputBubbleControllerTest } else if (button == SpeechInputBubble::BUTTON_TRY_AGAIN) { try_again_clicked_ = true; } - message_loop()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + message_loop()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } virtual void InfoBubbleFocusChanged(int caller_id) { VLOG(1) << "Received InfoBubbleFocusChanged"; EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); focus_changed_ = true; - message_loop()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + message_loop()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } // testing::Test methods. diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_browsertest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_browsertest.cc index 8ca0314..ab75383 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_browsertest.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter_browsertest.cc @@ -34,7 +34,7 @@ class TestingSpellCheckMessageFilter : public SpellCheckMessageFilter { virtual bool Send(IPC::Message* message) { sent_messages_.push_back(message); - loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return true; } diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 44bd226..a9f909a 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -107,7 +107,7 @@ class SSLUITest : public InProcessBrowserTest { // Wait a bit. MessageLoop::current()->PostDelayedTask( - FROM_HERE, new MessageLoop::QuitTask, timeout_ms); + FROM_HERE, MessageLoop::QuitClosure(), timeout_ms); ui_test_utils::RunMessageLoop(); } @@ -878,7 +878,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { if (GetConstrainedWindowCount() > 0) break; MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 1000); + MessageLoop::QuitClosure(), 1000); ui_test_utils::RunMessageLoop(); } ASSERT_EQ(1, GetConstrainedWindowCount()); diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc index b4e6174..36a9ecc 100644 --- a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc @@ -97,7 +97,7 @@ class AppNotificationDataTypeControllerTest ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::FILE)); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } void InitAndLoadManager() { diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc index 21edae1..c34cb81 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc @@ -57,7 +57,7 @@ class BrowserThreadModelWorkerTest : public testing::Test { EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB)); timer_.Stop(); // Stop the failure timer so the test succeeds. BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, new MessageLoop::QuitTask()); + BrowserThread::IO, FROM_HERE, MessageLoop::QuitClosure()); did_do_work_ = true; return UnrecoverableErrorInfo(); } @@ -67,7 +67,7 @@ class BrowserThreadModelWorkerTest : public testing::Test { void Timeout() { ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread."; BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, new MessageLoop::QuitTask()); + BrowserThread::IO, FROM_HERE, MessageLoop::QuitClosure()); } protected: diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 05325ec..0e8bedb 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -65,7 +65,7 @@ class HttpBridgeTest : public testing::Test { http_bridge->GetRequestContextGetter()-> GetURLRequestContext()-> http_transaction_factory()->GetSession()); - main_message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask); + main_message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } MessageLoop* GetIOThreadLoop() { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm index 2cab85f..a6ce4cb 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm @@ -47,7 +47,7 @@ TEST_F(BookmarkBarFolderHoverStateTest, HoverState) { // Test transition from opening to opened. message_loop.PostDelayedTask( FROM_HERE, - new MessageLoop::QuitTask, + MessageLoop::QuitClosure(), bookmarks::kDragHoverOpenDelay * 1000.0 * 1.5); message_loop.Run(); ASSERT_EQ(kHoverStateOpen, [bbfhs hoverState]); @@ -67,7 +67,7 @@ TEST_F(BookmarkBarFolderHoverStateTest, HoverState) { ASSERT_EQ(kHoverStateClosing, [bbfhs hoverState]); message_loop.PostDelayedTask( FROM_HERE, - new MessageLoop::QuitTask, + MessageLoop::QuitClosure(), bookmarks::kDragHoverCloseDelay * 1000.0 * 1.5); message_loop.Run(); ASSERT_EQ(kHoverStateClosed, [bbfhs hoverState]); diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc index 2c4c9d5..69781b5 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc @@ -60,7 +60,7 @@ class WebIntentPickerMock : public WebIntentPicker { virtual void WaitFor(int target_num_urls, int target_num_default_icons) { while (num_urls_ != target_num_urls || num_default_icons_ != target_num_default_icons) { - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); ui_test_utils::RunAllPendingInMessageLoop(); } } diff --git a/chrome/browser/ui/intents/web_intents_model_unittest.cc b/chrome/browser/ui/intents/web_intents_model_unittest.cc index ca9ba98..ee4f287 100644 --- a/chrome/browser/ui/intents/web_intents_model_unittest.cc +++ b/chrome/browser/ui/intents/web_intents_model_unittest.cc @@ -37,7 +37,7 @@ class WebIntentsModelTest : public testing::Test { wds_->Shutdown(); db_thread_.Stop(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc index ca752d0..1676cf5 100644 --- a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc @@ -148,7 +148,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest { // The timer for the animation will only kick in as async task. while (GetBoundsAnimator(panel)->is_animating()) { MessageLoopForUI::current()->PostTask(FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); MessageLoopForUI::current()->RunAllPending(); } } @@ -157,7 +157,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest { // The timer for the animation will only kick in as async task. while (GetSettingsButtonAnimator(panel)->is_animating()) { MessageLoopForUI::current()->PostTask(FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); MessageLoopForUI::current()->RunAllPending(); } } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 9d2c655..5a14df4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -229,7 +229,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { bb_view_.reset(); browser_.reset(); profile_.reset(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); ViewEventTestBase::TearDown(); diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index ed87411..8006e8a 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -89,7 +89,7 @@ class WebDataServiceTest : public testing::Test { wds_->Shutdown(); db_thread_.Stop(); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); } diff --git a/chrome/common/important_file_writer_unittest.cc b/chrome/common/important_file_writer_unittest.cc index 37012d7..9326cd9 100644 --- a/chrome/common/important_file_writer_unittest.cc +++ b/chrome/common/important_file_writer_unittest.cc @@ -76,7 +76,7 @@ TEST_F(ImportantFileWriterTest, ScheduleWrite) { writer.ScheduleWrite(&serializer); EXPECT_TRUE(writer.HasPendingWrite()); MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 100); + MessageLoop::QuitClosure(), 100); MessageLoop::current()->Run(); EXPECT_FALSE(writer.HasPendingWrite()); ASSERT_TRUE(file_util::PathExists(writer.path())); @@ -92,7 +92,7 @@ TEST_F(ImportantFileWriterTest, DoScheduledWrite) { EXPECT_TRUE(writer.HasPendingWrite()); writer.DoScheduledWrite(); MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 100); + MessageLoop::QuitClosure(), 100); MessageLoop::current()->Run(); EXPECT_FALSE(writer.HasPendingWrite()); ASSERT_TRUE(file_util::PathExists(writer.path())); @@ -108,7 +108,7 @@ TEST_F(ImportantFileWriterTest, BatchingWrites) { writer.ScheduleWrite(&bar); writer.ScheduleWrite(&baz); MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 100); + MessageLoop::QuitClosure(), 100); MessageLoop::current()->Run(); ASSERT_TRUE(file_util::PathExists(writer.path())); EXPECT_EQ("baz", GetFileContent(writer.path())); diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 28ffb74..84db35b 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -51,7 +51,7 @@ void ShutdownTask(MessageLoop* loop) { // Quit the main message loop. ASSERT_FALSE(g_good_shutdown); g_good_shutdown = true; - loop->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + loop->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } } // namespace @@ -227,7 +227,7 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) { base::Bind(&ShutdownTask, MessageLoop::current()))); message_loop.PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), + MessageLoop::QuitClosure(), TestTimeouts::action_max_timeout_ms()); EXPECT_FALSE(g_good_shutdown); message_loop.Run(); @@ -305,7 +305,7 @@ class MockLaunchd : public Launchd { virtual bool RemoveJob(CFStringRef label, CFErrorRef* error) OVERRIDE { remove_called_ = true; - message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask); + message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return true; } @@ -314,7 +314,7 @@ class MockLaunchd : public Launchd { CFStringRef name, CFStringRef session_type) OVERRIDE { restart_called_ = true; - message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask); + message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return true; } @@ -382,7 +382,7 @@ class ServiceProcessStateFileManipulationTest : public ::testing::Test { io_thread_.message_loop_proxy(), base::Closure())); loop_.PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask, + MessageLoop::QuitClosure(), TestTimeouts::action_max_timeout_ms()); } diff --git a/chrome/common/worker_thread_ticker_unittest.cc b/chrome/common/worker_thread_ticker_unittest.cc index b3e1f08..b999c33 100644 --- a/chrome/common/worker_thread_ticker_unittest.cc +++ b/chrome/common/worker_thread_ticker_unittest.cc @@ -19,7 +19,7 @@ class TestCallback : public WorkerThreadTicker::Callback { counter_++; // Finish the test faster. - message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } int counter() const { return counter_; } @@ -38,7 +38,7 @@ class LongCallback : public WorkerThreadTicker::Callback { void RunMessageLoopForAWhile() { MessageLoop::current()->PostDelayedTask(FROM_HERE, - new MessageLoop::QuitTask(), 500); + MessageLoop::QuitClosure(), 500); MessageLoop::current()->Run(); } diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index 319ac8c..e7ef69e 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -230,7 +230,7 @@ CloudPrintURLFetcherBasicTest::HandleRawResponse( if (handle_raw_response_) { // If the current message loop is not the IO loop, it will be shut down when // the main loop returns and this thread subsequently goes out of scope. - io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + io_message_loop_proxy()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return CloudPrintURLFetcher::STOP_PROCESSING; } return CloudPrintURLFetcher::CONTINUE_PROCESSING; @@ -244,7 +244,7 @@ CloudPrintURLFetcherBasicTest::HandleRawData( // We should never get here if we returned true in HandleRawResponse EXPECT_FALSE(handle_raw_response_); if (handle_raw_data_) { - io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + io_message_loop_proxy()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return CloudPrintURLFetcher::STOP_PROCESSING; } return CloudPrintURLFetcher::CONTINUE_PROCESSING; @@ -259,7 +259,7 @@ CloudPrintURLFetcherBasicTest::HandleJSONData( // We should never get here if we returned true in one of the above methods. EXPECT_FALSE(handle_raw_response_); EXPECT_FALSE(handle_raw_data_); - io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + io_message_loop_proxy()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return CloudPrintURLFetcher::STOP_PROCESSING; } @@ -279,7 +279,7 @@ CloudPrintURLFetcherOverloadTest::HandleRawData( // We have already sent 20 requests continuously. And we expect that // it takes more than 1 second due to the overload protection settings. EXPECT_TRUE(Time::Now() - start_time_ >= one_second); - io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + io_message_loop_proxy()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } return CloudPrintURLFetcher::STOP_PROCESSING; } @@ -298,7 +298,7 @@ CloudPrintURLFetcherRetryBackoffTest::HandleRawData( void CloudPrintURLFetcherRetryBackoffTest::OnRequestGiveUp() { // It takes more than 200 ms to finish all 11 requests. EXPECT_TRUE(Time::Now() - start_time_ >= TimeDelta::FromMilliseconds(200)); - io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + io_message_loop_proxy()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } // http://code.google.com/p/chromium/issues/detail?id=60426 diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index a7ecabc..4bd18a5 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -258,7 +258,7 @@ void ServiceProcess::Shutdown() { } void ServiceProcess::Terminate() { - main_message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + main_message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } bool ServiceProcess::HandleClientDisconnect() { diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index f4077a5..d0e792d 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -45,7 +45,7 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { DestroyBrowser(); profile_.reset(NULL); - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); MessageLoop::current()->Run(); #if defined(OS_WIN) diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 1c18635..2462044 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -244,10 +244,10 @@ bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host, } void RunAllPendingMessageAndSendQuit(content::BrowserThread::ID thread_id) { - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); RunMessageLoop(); content::BrowserThread::PostTask(thread_id, FROM_HERE, - new MessageLoop::QuitTask()); + MessageLoop::QuitClosure()); } } // namespace @@ -277,7 +277,7 @@ void RunMessageLoop() { } void RunAllPendingInMessageLoop() { - MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); + MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); ui_test_utils::RunMessageLoop(); } @@ -691,12 +691,12 @@ void TimedMessageLoopRunner::RunFor(int ms) { void TimedMessageLoopRunner::Quit() { quit_loop_invoked_ = true; - loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask); + loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); } void TimedMessageLoopRunner::QuitAfter(int ms) { quit_loop_invoked_ = true; - loop_->PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, ms); + loop_->PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), ms); } namespace { |