Index: mojo/system/remote_message_pipe_unittest.cc |
diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc |
index f6db49f4b966a7754730dee455808319f50dbbd6..e1f555791713b9ddf4d2d8cb2a92b40c411e1772 100644 |
--- a/mojo/system/remote_message_pipe_unittest.cc |
+++ b/mojo/system/remote_message_pipe_unittest.cc |
@@ -197,7 +197,7 @@ TEST_F(RemoteMessagePipeTest, Basic) { |
// it later, it might already be readable.) |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
// Write to MP 0, port 0. |
EXPECT_EQ(MOJO_RESULT_OK, |
@@ -224,7 +224,7 @@ TEST_F(RemoteMessagePipeTest, Basic) { |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp0->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 456)); |
+ mp0->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 456)); |
EXPECT_EQ(MOJO_RESULT_OK, |
mp1->WriteMessage(1, |
@@ -252,7 +252,8 @@ TEST_F(RemoteMessagePipeTest, Basic) { |
// when it realizes that MP 0, port 0 has been closed. (It may also fail |
// immediately.) |
waiter.Init(); |
- MojoResult result = mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789); |
+ MojoResult result = |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789); |
if (result == MOJO_RESULT_OK) { |
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, |
waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context)); |
@@ -298,7 +299,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) { |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp3->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789)); |
+ mp3->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789)); |
EXPECT_EQ(MOJO_RESULT_OK, |
mp2->WriteMessage(0, |
@@ -344,7 +345,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) { |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
EXPECT_EQ(MOJO_RESULT_OK, |
mp0->WriteMessage(0, |
@@ -427,7 +428,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) { |
// it later, it might already be readable.) |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
BootstrapMessagePipeNoWait(1, mp1); |
@@ -472,7 +473,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { |
// it later, it might already be readable.) |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
// Write to MP 0, port 0. |
{ |
@@ -528,7 +529,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { |
// Wait for the dispatcher to become readable. |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- dispatcher->AddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 456)); |
+ dispatcher->AddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 456)); |
EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context)); |
EXPECT_EQ(456u, context); |
dispatcher->RemoveWaiter(&waiter); |
@@ -545,7 +546,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { |
// Prepare to wait on "local_mp", port 1. |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- local_mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789)); |
+ local_mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789)); |
// Write to the dispatcher. |
EXPECT_EQ(MOJO_RESULT_OK, |
@@ -620,7 +621,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_SharedBufferPassing) { |
// it later, it might already be readable.) |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
// Write to MP 0, port 0. |
{ |
@@ -731,7 +732,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_PlatformHandlePassing) { |
// it later, it might already be readable.) |
waiter.Init(); |
EXPECT_EQ(MOJO_RESULT_OK, |
- mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); |
+ mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); |
// Write to MP 0, port 0. |
{ |