summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorki.stfu <ki.stfu@gmail.com>2015-10-12 13:29:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-12 20:30:20 +0000
commitf8812d5afcc531663f1ad4ddfcaefd49f54aeac0 (patch)
tree4d4a92a7ebc3c1c05827f2e7ce847c9e59eb4b28 /mojo/shell
parent2a03078ea69b3ee89cc51c6cab1efd0b0ed16b66 (diff)
downloadchromium_src-f8812d5afcc531663f1ad4ddfcaefd49f54aeac0.zip
chromium_src-f8812d5afcc531663f1ad4ddfcaefd49f54aeac0.tar.gz
chromium_src-f8812d5afcc531663f1ad4ddfcaefd49f54aeac0.tar.bz2
Don't use base::MessageLoop::{Quit,QuitClosure} in mojo/
This patch renames base::MessageLoop::{Quit,QuitClosure} to base::MessageLoop::{QuitWhenIdle,QuitWhenIdleClosure}. BUG=131220 TEST= R=sky@chromium.org Review URL: https://codereview.chromium.org/1402533003 Cr-Commit-Position: refs/heads/master@{#353587}
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/application_manager_unittest.cc10
-rw-r--r--mojo/shell/capability_filter_test.cc4
2 files changed, 7 insertions, 7 deletions
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 058240c..e13f616f 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -54,7 +54,7 @@ class TestServiceImpl : public TestService {
--context_->num_impls;
if (!base::MessageLoop::current()->is_running())
return;
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
// TestService implementation:
@@ -76,7 +76,7 @@ class TestClient {
void AckTest() {
if (quit_after_ack_)
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
void Test(const std::string& test_string) {
@@ -268,7 +268,7 @@ class TestAImpl : public TestA {
}
void Quit() {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
test_context_->set_a_called_quit();
test_context_->QuitSoon();
}
@@ -291,7 +291,7 @@ class TestBImpl : public TestB {
~TestBImpl() override {
test_context_->IncrementNumBDeletes();
if (base::MessageLoop::current()->is_running())
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
test_context_->QuitSoon();
}
@@ -351,7 +351,7 @@ class Tester : public ApplicationDelegate,
requestor_url_ != connection->GetRemoteApplicationURL()) {
context_->set_tester_called_quit();
context_->QuitSoon();
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
return false;
}
// If we're coming from A, then add B, otherwise A.
diff --git a/mojo/shell/capability_filter_test.cc b/mojo/shell/capability_filter_test.cc
index f8d0349..b50f717 100644
--- a/mojo/shell/capability_filter_test.cc
+++ b/mojo/shell/capability_filter_test.cc
@@ -83,12 +83,12 @@ class ConnectionValidator : public ApplicationLoader,
if (i != expectations_.end()) {
expectations_.erase(i);
if (expectations_.empty())
- loop_->Quit();
+ loop_->QuitWhenIdle();
} else {
// This is a test failure, and will result in PrintUnexpectedExpecations()
// being called.
unexpected_.insert(result);
- loop_->Quit();
+ loop_->QuitWhenIdle();
}
}