summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel_posix_unittest.cc
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 22:28:12 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 22:28:12 +0000
commit753bb25fc70b560fb3539e2b63843a193ccb295a (patch)
treed42966216756764b92d90162e993ab766c307dc7 /ipc/ipc_channel_posix_unittest.cc
parent715e27238d32ba17d2c06acf37bca40bb0a180cb (diff)
downloadchromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.zip
chromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.tar.gz
chromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.tar.bz2
Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=231330
This is a speculative revert to see if it's the cause of hanging renderers. BUG=313112 Review URL: https://codereview.chromium.org/57783006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_posix_unittest.cc')
-rw-r--r--ipc/ipc_channel_posix_unittest.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index 3a00716..66ddeb2 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -244,8 +244,9 @@ TEST_F(IPCChannelPosixTest, AdvancedConnected) {
SpinRunLoop(TestTimeouts::action_max_timeout());
ASSERT_EQ(IPCChannelPosixTestListener::CONNECTED, listener.status());
ASSERT_TRUE(channel.HasAcceptedConnection());
- IPC::Message* message = new IPC::Message(0, /* routing_id */
- kQuitMessage /* message type */);
+ IPC::Message* message = new IPC::Message(0, // routing_id
+ kQuitMessage, // message type
+ IPC::Message::PRIORITY_NORMAL);
channel.Send(message);
SpinRunLoop(TestTimeouts::action_timeout());
int exit_code = 0;
@@ -282,8 +283,9 @@ TEST_F(IPCChannelPosixTest, ResetState) {
SpinRunLoop(TestTimeouts::action_max_timeout());
ASSERT_EQ(IPCChannelPosixTestListener::CONNECTED, listener.status());
ASSERT_TRUE(channel.HasAcceptedConnection());
- IPC::Message* message = new IPC::Message(0, /* routing_id */
- kQuitMessage /* message type */);
+ IPC::Message* message = new IPC::Message(0, // routing_id
+ kQuitMessage, // message type
+ IPC::Message::PRIORITY_NORMAL);
channel.Send(message);
SpinRunLoop(TestTimeouts::action_timeout());
EXPECT_TRUE(base::KillProcess(handle, 0, false));
@@ -340,8 +342,9 @@ TEST_F(IPCChannelPosixTest, MultiConnection) {
EXPECT_EQ(exit_code, 0);
ASSERT_EQ(IPCChannelPosixTestListener::DENIED, listener.status());
ASSERT_TRUE(channel.HasAcceptedConnection());
- IPC::Message* message = new IPC::Message(0, /* routing_id */
- kQuitMessage /* message type */);
+ IPC::Message* message = new IPC::Message(0, // routing_id
+ kQuitMessage, // message type
+ IPC::Message::PRIORITY_NORMAL);
channel.Send(message);
SpinRunLoop(TestTimeouts::action_timeout());
EXPECT_TRUE(base::WaitForExitCode(handle, &exit_code));