diff options
author | ki.stfu <ki.stfu@gmail.com> | 2015-10-12 10:26:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-12 17:27:02 +0000 |
commit | a21ed8c892e49fd2ceebc9890d01f488111978cc (patch) | |
tree | 7f1c3b4d8ae2ebe88503111031c9560a4e27c89d /extensions | |
parent | 68f62f8f339448ccaa577d56a53a158289ec5ab8 (diff) | |
download | chromium_src-a21ed8c892e49fd2ceebc9890d01f488111978cc.zip chromium_src-a21ed8c892e49fd2ceebc9890d01f488111978cc.tar.gz chromium_src-a21ed8c892e49fd2ceebc9890d01f488111978cc.tar.bz2 |
Don't use base::MessageLoop::{Quit,QuitClosure} in extensions/, ipc/
This patch renames base::MessageLoop::{Quit,QuitClosure} to
base::MessageLoop::{QuitWhenIdle,QuitWhenIdleClosure}.
BUG=131220
TEST=
R=finnur@chromium.org,agl@chromium.org
Review URL: https://codereview.chromium.org/1389163008
Cr-Commit-Position: refs/heads/master@{#353545}
Diffstat (limited to 'extensions')
8 files changed, 10 insertions, 10 deletions
diff --git a/extensions/browser/api/alarms/alarms_api_unittest.cc b/extensions/browser/api/alarms/alarms_api_unittest.cc index 61a469b..b08eed3 100644 --- a/extensions/browser/api/alarms/alarms_api_unittest.cc +++ b/extensions/browser/api/alarms/alarms_api_unittest.cc @@ -32,7 +32,7 @@ class AlarmDelegate : public AlarmManager::Delegate { void OnAlarm(const std::string& extension_id, const Alarm& alarm) override { alarms_seen.push_back(alarm.js_alarm->name); if (base::MessageLoop::current()->is_running()) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } std::vector<std::string> alarms_seen; diff --git a/extensions/browser/api_test_utils.cc b/extensions/browser/api_test_utils.cc index 47bcb0e..83ed5fc 100644 --- a/extensions/browser/api_test_utils.cc +++ b/extensions/browser/api_test_utils.cc @@ -55,7 +55,7 @@ class SendResponseDelegate response_.reset(new bool); *response_ = success; if (should_post_quit_) { - base::MessageLoopForUI::current()->Quit(); + base::MessageLoopForUI::current()->QuitWhenIdle(); } } diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc index 29bb1ff..88c2fe4 100644 --- a/extensions/browser/extension_icon_image_unittest.cc +++ b/extensions/browser/extension_icon_image_unittest.cc @@ -129,7 +129,7 @@ class ExtensionIconImageTest : public ExtensionsTest, void OnExtensionIconImageChanged(IconImage* image) override { image_loaded_count_++; if (quit_in_image_loaded_) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } gfx::ImageSkia GetDefaultIcon() { diff --git a/extensions/browser/file_reader_unittest.cc b/extensions/browser/file_reader_unittest.cc index efd4367..5d40d31 100644 --- a/extensions/browser/file_reader_unittest.cc +++ b/extensions/browser/file_reader_unittest.cc @@ -45,7 +45,7 @@ class Receiver { void DidReadFile(bool success, const std::string& data) { succeeded_ = success; data_ = data; - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } bool succeeded_; diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc index f1f2aad..530a006b 100644 --- a/extensions/browser/image_loader_unittest.cc +++ b/extensions/browser/image_loader_unittest.cc @@ -47,14 +47,14 @@ class ImageLoaderTest : public ExtensionsTest { void OnImageLoaded(const gfx::Image& image) { image_loaded_count_++; if (quit_in_image_loaded_) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); image_ = image; } void OnImageFamilyLoaded(const gfx::ImageFamily& image_family) { image_loaded_count_++; if (quit_in_image_loaded_) - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); image_family_ = image_family; } diff --git a/extensions/browser/value_store/value_store_frontend_unittest.cc b/extensions/browser/value_store/value_store_frontend_unittest.cc index be65b7b..b3030f5 100644 --- a/extensions/browser/value_store/value_store_frontend_unittest.cc +++ b/extensions/browser/value_store/value_store_frontend_unittest.cc @@ -56,7 +56,7 @@ class ValueStoreFrontendTest : public testing::Test { void GetAndWait(scoped_ptr<base::Value>* output, scoped_ptr<base::Value> result) { *output = result.Pass(); - base::MessageLoop::current()->Quit(); + base::MessageLoop::current()->QuitWhenIdle(); } scoped_ptr<ValueStoreFrontend> storage_; diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc index f89714a..2cf78ef 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura.cc @@ -246,8 +246,8 @@ void ShellDesktopControllerAura::OnHostCloseRequested( const aura::WindowTreeHost* host) { DCHECK_EQ(host_.get(), host); CloseAppWindows(); - base::MessageLoop::current()->PostTask(FROM_HERE, - base::MessageLoop::QuitClosure()); + base::MessageLoop::current()->PostTask( + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); } void ShellDesktopControllerAura::InitWindowManager() { diff --git a/extensions/test/extension_test_message_listener.cc b/extensions/test/extension_test_message_listener.cc index a1970be..2712dc3c 100644 --- a/extensions/test/extension_test_message_listener.cc +++ b/extensions/test/extension_test_message_listener.cc @@ -110,7 +110,7 @@ void ExtensionTestMessageListener::Observe( if (waiting_) { waiting_ = false; - base::MessageLoopForUI::current()->Quit(); + base::MessageLoopForUI::current()->QuitWhenIdle(); } } } |