summaryrefslogtreecommitdiffstats
path: root/ipc/mojo
diff options
context:
space:
mode:
authorki.stfu <ki.stfu@gmail.com>2015-10-12 10:26:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-12 17:27:02 +0000
commita21ed8c892e49fd2ceebc9890d01f488111978cc (patch)
tree7f1c3b4d8ae2ebe88503111031c9560a4e27c89d /ipc/mojo
parent68f62f8f339448ccaa577d56a53a158289ec5ab8 (diff)
downloadchromium_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 'ipc/mojo')
-rw-r--r--ipc/mojo/ipc_channel_mojo_unittest.cc20
-rw-r--r--ipc/mojo/ipc_mojo_bootstrap_unittest.cc4
2 files changed, 12 insertions, 12 deletions
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index 58d3e9f..f1982533 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -44,7 +44,7 @@ class ListenerThatExpectsOK : public IPC::Listener {
EXPECT_TRUE(iter.ReadString(&should_be_ok));
EXPECT_EQ(should_be_ok, "OK");
received_ok_ = true;
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
return true;
}
@@ -202,14 +202,14 @@ class ListenerExpectingErrors : public IPC::Listener {
}
void OnChannelConnected(int32_t peer_pid) override {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
bool OnMessageReceived(const IPC::Message& message) override { return true; }
void OnChannelError() override {
has_error_ = true;
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
bool has_error() const { return has_error_; }
@@ -244,7 +244,7 @@ class ListenerThatQuits : public IPC::Listener {
}
void OnChannelConnected(int32_t peer_pid) override {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
};
@@ -394,7 +394,7 @@ class ListenerThatExpectsMessagePipe : public IPC::Listener {
bool OnMessageReceived(const IPC::Message& message) override {
base::PickleIterator iter(message);
HandleSendingHelper::ReadReceivedPipe(message, &iter);
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
ListenerThatExpectsOK::SendOK(sender_);
return true;
}
@@ -478,7 +478,7 @@ class ListenerThatExpectsMessagePipeUsingParamTrait : public IPC::Listener {
MojoClose(handle.value());
}
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
ListenerThatExpectsOK::SendOK(sender_);
return true;
}
@@ -597,7 +597,7 @@ class ListenerSendingOneOk : public IPC::Listener {
void OnChannelConnected(int32_t peer_pid) override {
ListenerThatExpectsOK::SendOK(sender_);
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
void set_sender(IPC::Sender* sender) { sender_ = sender; }
@@ -686,7 +686,7 @@ class ListenerThatExpectsFile : public IPC::Listener {
bool OnMessageReceived(const IPC::Message& message) override {
base::PickleIterator iter(message);
HandleSendingHelper::ReadReceivedFile(message, &iter);
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
ListenerThatExpectsOK::SendOK(sender_);
return true;
}
@@ -751,7 +751,7 @@ class ListenerThatExpectsFileAndPipe : public IPC::Listener {
base::PickleIterator iter(message);
HandleSendingHelper::ReadReceivedFile(message, &iter);
HandleSendingHelper::ReadReceivedPipe(message, &iter);
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
ListenerThatExpectsOK::SendOK(sender_);
return true;
}
@@ -816,7 +816,7 @@ class ListenerThatVerifiesPeerPid : public IPC::Listener {
public:
void OnChannelConnected(int32_t peer_pid) override {
EXPECT_EQ(peer_pid, kMagicChildId);
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
bool OnMessageReceived(const IPC::Message& message) override {
diff --git a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
index 528c235..391e953 100644
--- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
@@ -37,11 +37,11 @@ void TestingDelegate::OnPipeAvailable(
mojo::embedder::ScopedPlatformHandle handle,
int32 peer_pid) {
passed_ = true;
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
void TestingDelegate::OnBootstrapError() {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
// Times out on Android; see http://crbug.com/502290