diff options
23 files changed, 38 insertions, 43 deletions
diff --git a/base/android/java_handler_thread.cc b/base/android/java_handler_thread.cc index 91c8f04..93d45e3 100644 --- a/base/android/java_handler_thread.cc +++ b/base/android/java_handler_thread.cc @@ -64,7 +64,7 @@ void JavaHandlerThread::InitializeThread(JNIEnv* env, jobject obj, } void JavaHandlerThread::StopThread(JNIEnv* env, jobject obj, jlong event) { - static_cast<MessageLoopForUI*>(message_loop_.get())->Quit(); + static_cast<MessageLoopForUI*>(message_loop_.get())->QuitWhenIdle(); reinterpret_cast<base::WaitableEvent*>(event)->Signal(); } diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index 63a29f1..77edfdb 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -242,9 +242,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { // Return as soon as all items that can be run are taken care of. void RunUntilIdle(); - // TODO(jbates) remove this. crbug.com/131220. See QuitWhenIdle(). - void Quit() { QuitWhenIdle(); } - // Deprecated: use RunLoop instead. // // Signals the Run method to return when it becomes idle. It will continue to @@ -268,9 +265,6 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { // to be processed before returning from Run. void QuitNow(); - // TODO(jbates) remove this. crbug.com/131220. See QuitWhenIdleClosure(). - static Closure QuitClosure() { return QuitWhenIdleClosure(); } - // Deprecated: use RunLoop instead. // Construct a Closure that will call QuitWhenIdle(). Useful to schedule an // arbitrary MessageLoop to QuitWhenIdle. diff --git a/base/message_loop/message_loop_test.cc b/base/message_loop/message_loop_test.cc index eca6c8f..a544a70 100644 --- a/base/message_loop/message_loop_test.cc +++ b/base/message_loop/message_loop_test.cc @@ -104,8 +104,9 @@ void RunTest_PostTask(MessagePumpFactory factory) { MessageLoop::current()->PostTask(FROM_HERE, Bind( &Foo::Test2Mixed, foo.get(), a, &d)); // After all tests, post a message that will shut down the message loop - MessageLoop::current()->PostTask(FROM_HERE, Bind( - &MessageLoop::Quit, Unretained(MessageLoop::current()))); + MessageLoop::current()->PostTask( + FROM_HERE, + Bind(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); // Now kick things off MessageLoop::current()->Run(); diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc index 89f9a40..dcac662 100644 --- a/base/message_loop/message_loop_unittest.cc +++ b/base/message_loop/message_loop_unittest.cc @@ -907,8 +907,9 @@ TEST(MessageLoopTest, ThreadMainTaskRunner) { &Foo::Test1ConstRef, foo.get(), a)); // Post quit task; - MessageLoop::current()->PostTask(FROM_HERE, Bind( - &MessageLoop::Quit, Unretained(MessageLoop::current()))); + MessageLoop::current()->PostTask( + FROM_HERE, + Bind(&MessageLoop::QuitWhenIdle, Unretained(MessageLoop::current()))); // Now kick things off MessageLoop::current()->Run(); @@ -983,7 +984,7 @@ LRESULT CALLBACK TestWndProcThunk(HWND hwnd, UINT message, break; } EXPECT_TRUE(did_run); - MessageLoop::current()->Quit(); + MessageLoop::current()->QuitWhenIdle(); break; } return 0; diff --git a/base/run_loop.h b/base/run_loop.h index 0024108..9ff8d39 100644 --- a/base/run_loop.h +++ b/base/run_loop.h @@ -38,8 +38,8 @@ class BASE_EXPORT RunLoop { // Run the current MessageLoop. This blocks until Quit is called. Before // calling Run, be sure to grab an AsWeakPtr or the QuitClosure in order to - // stop the MessageLoop asynchronously. MessageLoop::Quit and QuitNow will - // also trigger a return from Run, but those are deprecated. + // stop the MessageLoop asynchronously. MessageLoop::QuitWhenIdle and QuitNow + // will also trigger a return from Run, but those are deprecated. void Run(); // Run the current MessageLoop until it doesn't find any tasks or messages in diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc index c200c44..4d841f7 100644 --- a/base/test/launcher/test_launcher.cc +++ b/base/test/launcher/test_launcher.cc @@ -972,7 +972,7 @@ void TestLauncher::RunTestIteration() { CommandLine::ForCurrentProcess()->HasSwitch(kGTestBreakOnFailure); if (cycles_ == 0 || (stop_on_failure && test_success_count_ != test_finished_count_)) { - MessageLoop::current()->Quit(); + MessageLoop::current()->QuitWhenIdle(); return; } diff --git a/base/threading/thread.cc b/base/threading/thread.cc index 4b517a1..c775fe7 100644 --- a/base/threading/thread.cc +++ b/base/threading/thread.cc @@ -262,7 +262,7 @@ void Thread::ThreadMain() { com_initializer.reset(); #endif - // Assert that MessageLoop::Quit was called by ThreadQuitHelper. + // Assert that MessageLoop::QuitWhenIdle was called by ThreadQuitHelper. DCHECK(GetThreadWasQuitProperly()); // We can't receive messages anymore. diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc index b97f3ae..9cbbd7e 100644 --- a/cc/raster/tile_task_worker_pool_unittest.cc +++ b/cc/raster/tile_task_worker_pool_unittest.cc @@ -180,7 +180,7 @@ class TileTaskWorkerPoolTest void AllTileTasksFinished() { tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks(); - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } // Overriden from TileTaskWorkerPoolClient: @@ -303,7 +303,7 @@ class TileTaskWorkerPoolTest void OnTimeout() { timed_out_ = true; - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } protected: diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 381eb0d..20ef8fe 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -823,7 +823,7 @@ void LayerTreeTest::RealEndTest() { return; } - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } void LayerTreeTest::DispatchAddAnimation(Layer* layer_to_receive_animation, diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 070d4ef7..471b939 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -51,7 +51,7 @@ class ServiceStateURLRequestDelegate : public net::URLRequest::Delegate { void OnReadCompleted(net::URLRequest* request, int bytes_read) override { Read(request); if (!request->status().is_io_pending()) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } const std::string& data() const { @@ -190,8 +190,7 @@ std::string ServiceState::LoginToGoogle(const std::string& service, request->Start(); base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), base::TimeDelta::FromMilliseconds(kRequestTimeoutMs)); base::MessageLoop::current()->Run(); diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index bfb4af9..76e9863 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -280,8 +280,8 @@ LRESULT SetupDialog::OnCancel(UINT, INT nIdentifier, HWND, BOOL& handled) { LRESULT SetupDialog::OnDestroy(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) { - base::MessageLoop::current()->PostTask(FROM_HERE, - base::MessageLoop::QuitClosure()); + base::MessageLoop::current()->PostTask( + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); return 1; } diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc index 31d907d..7e8bc02 100644 --- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc @@ -434,8 +434,7 @@ TEST_F(ConnectionFactoryImplTest, CanarySucceedsRetryDuringLogin) { // Pump the loop, to ensure the pending backoff retry has no effect. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), base::TimeDelta::FromMilliseconds(1)); WaitForConnections(); } diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index b3e209b..7ee5e73 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -325,7 +325,7 @@ class Simulator { if (!sims_remaining_.size()) { DumpOutput(); - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); return false; } diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc index 2aa7aca..5c4daf1 100644 --- a/jingle/glue/thread_wrapper_unittest.cc +++ b/jingle/glue/thread_wrapper_unittest.cc @@ -148,8 +148,7 @@ TEST_F(ThreadWrapperTest, PostDelayed) { .WillOnce(DeleteMessageData()); message_loop_.PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), base::TimeDelta::FromMilliseconds(kMaxTestDelay)); message_loop_.Run(); } @@ -200,8 +199,7 @@ TEST_F(ThreadWrapperTest, ClearDelayed) { .WillOnce(DeleteMessageData()); message_loop_.PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), base::TimeDelta::FromMilliseconds(kMaxTestDelay)); message_loop_.Run(); } diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc index 3d29a7b..c9ea5a8 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_message_loop_proxy.cc @@ -141,9 +141,9 @@ int32_t MessageLoopResource::PostQuit(PP_Bool should_destroy) { should_destroy_ = true; if (IsCurrent() && nested_invocations_ > 0) - loop_->Quit(); + loop_->QuitWhenIdle(); else - PostClosure(FROM_HERE, base::MessageLoop::QuitClosure(), 0); + PostClosure(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), 0); return PP_OK; } diff --git a/storage/common/database/database_connections.cc b/storage/common/database/database_connections.cc index b0b55de..afa9ee3 100644 --- a/storage/common/database/database_connections.cc +++ b/storage/common/database/database_connections.cc @@ -169,7 +169,7 @@ void DatabaseConnectionsWrapper::RemoveOpenConnection( base::AutoLock auto_lock(open_connections_lock_); open_connections_.RemoveConnection(origin_identifier, database_name); if (waiting_for_dbs_to_close_ && open_connections_.IsEmpty()) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } } // namespace storage diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc index 7c6fe822..543947e 100644 --- a/sync/internal_api/http_bridge_unittest.cc +++ b/sync/internal_api/http_bridge_unittest.cc @@ -170,7 +170,8 @@ class MAYBE_SyncHttpBridgeTest : public testing::Test { http_bridge->GetRequestContextGetterForTest()-> GetURLRequestContext()-> http_transaction_factory()->GetSession()); - main_message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); + main_message_loop->PostTask(FROM_HERE, + base::MessageLoop::QuitWhenIdleClosure()); } base::MessageLoop* GetIOThreadLoop() { return io_thread_.message_loop(); } diff --git a/sync/util/get_session_name_unittest.cc b/sync/util/get_session_name_unittest.cc index 7b7b241..8aff5e0 100644 --- a/sync/util/get_session_name_unittest.cc +++ b/sync/util/get_session_name_unittest.cc @@ -23,7 +23,7 @@ class GetSessionNameTest : public ::testing::Test { public: void SetSessionNameAndQuit(const std::string& session_name) { session_name_ = session_name; - message_loop_.Quit(); + message_loop_.QuitWhenIdle(); } protected: diff --git a/testing/generate_gmock_mutant.py b/testing/generate_gmock_mutant.py index 45ac4ed..b881cd9 100755 --- a/testing/generate_gmock_mutant.py +++ b/testing/generate_gmock_mutant.py @@ -57,7 +57,8 @@ HEADER = """\ // // void QuitMessageLoop(int seconds) { // base::MessageLoop* loop = base::MessageLoop::current(); -// loop->PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(), +// loop->PostDelayedTask(FROM_HERE, +// base::MessageLoop::QuitWhenIdleClosure(), // 1000 * seconds); // } // }; diff --git a/testing/gmock_mutant.h b/testing/gmock_mutant.h index 6049d1d..f849119 100644 --- a/testing/gmock_mutant.h +++ b/testing/gmock_mutant.h @@ -48,7 +48,8 @@ // // void QuitMessageLoop(int seconds) { // base::MessageLoop* loop = base::MessageLoop::current(); -// loop->PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(), +// loop->PostDelayedTask(FROM_HERE, +// base::MessageLoop::QuitWhenIdleClosure(), // 1000 * seconds); // } // }; diff --git a/tools/ipc_fuzzer/message_replay/replay_process.cc b/tools/ipc_fuzzer/message_replay/replay_process.cc index 017b6a1..b59c438 100644 --- a/tools/ipc_fuzzer/message_replay/replay_process.cc +++ b/tools/ipc_fuzzer/message_replay/replay_process.cc @@ -108,7 +108,7 @@ bool ReplayProcess::OpenTestcase() { void ReplayProcess::SendNextMessage() { if (message_index_ >= messages_.size()) { - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); return; } @@ -119,7 +119,7 @@ void ReplayProcess::SendNextMessage() { if (!channel_->Send(message)) { LOG(ERROR) << "ChannelProxy::Send() failed after " << message_index_ << " messages"; - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } } @@ -139,7 +139,7 @@ bool ReplayProcess::OnMessageReceived(const IPC::Message& msg) { void ReplayProcess::OnChannelError() { LOG(ERROR) << "Channel error, quitting after " << message_index_ << " messages"; - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } } // namespace ipc_fuzzer diff --git a/win8/metro_driver/chrome_app_view.cc b/win8/metro_driver/chrome_app_view.cc index 4c5a8be..051f37f 100644 --- a/win8/metro_driver/chrome_app_view.cc +++ b/win8/metro_driver/chrome_app_view.cc @@ -765,7 +765,7 @@ void RunMessageLoop(winui::Core::ICoreDispatcher* dispatcher) { ::CoreProcessEventsOption_ProcessUntilQuit); // Wind down the thread's chrome message loop. - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } void ChromeAppView::CheckForOSKActivation() { diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 0660120..55335a4 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -278,7 +278,7 @@ void RunMessageLoop(winui::Core::ICoreDispatcher* dispatcher) { ::CoreProcessEventsOption_ProcessUntilQuit); // Wind down the thread's chrome message loop. - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } // Helper to return the state of the shift/control/alt keys. |