| Index: mojo/system/remote_message_pipe_posix_unittest.cc
|
| diff --git a/mojo/system/remote_message_pipe_posix_unittest.cc b/mojo/system/remote_message_pipe_posix_unittest.cc
|
| index 5f1616690cfa86ae4108090fedaed3ad1e2d4f5d..d5b0d9702af9e1db237e3fe282f666a149398a4c 100644
|
| --- a/mojo/system/remote_message_pipe_posix_unittest.cc
|
| +++ b/mojo/system/remote_message_pipe_posix_unittest.cc
|
| @@ -152,7 +152,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_0->WriteMessage(0,
|
| hello, sizeof(hello),
|
| - NULL, 0,
|
| + NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
|
|
| // Wait.
|
| @@ -163,7 +163,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_1->ReadMessage(1,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
|
| EXPECT_EQ(0, strcmp(buffer, hello));
|
| @@ -177,7 +177,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_1->WriteMessage(1,
|
| world, sizeof(world),
|
| - NULL, 0,
|
| + NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
|
|
| EXPECT_EQ(456, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
|
| @@ -187,7 +187,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_0->ReadMessage(0,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(sizeof(world), static_cast<size_t>(buffer_size));
|
| EXPECT_EQ(0, strcmp(buffer, world));
|
| @@ -256,7 +256,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_2->WriteMessage(0,
|
| hello, sizeof(hello),
|
| - NULL, 0,
|
| + NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
|
|
| EXPECT_EQ(789, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
|
| @@ -267,19 +267,19 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_0->ReadMessage(0,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| buffer_size = static_cast<uint32_t>(sizeof(buffer));
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_1->ReadMessage(1,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| buffer_size = static_cast<uint32_t>(sizeof(buffer));
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_2->ReadMessage(0,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
|
|
| // Read from MP 3, port 1.
|
| @@ -287,7 +287,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_3->ReadMessage(1,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
|
| EXPECT_EQ(0, strcmp(buffer, hello));
|
| @@ -301,7 +301,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_0->WriteMessage(0,
|
| world, sizeof(world),
|
| - NULL, 0,
|
| + NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
|
|
| EXPECT_EQ(123, waiter.Wait(MOJO_DEADLINE_INDEFINITE));
|
| @@ -312,26 +312,26 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_0->ReadMessage(0,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| buffer_size = static_cast<uint32_t>(sizeof(buffer));
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_2->ReadMessage(0,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| buffer_size = static_cast<uint32_t>(sizeof(buffer));
|
| EXPECT_EQ(MOJO_RESULT_NOT_FOUND,
|
| mp_3->ReadMessage(1,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
|
|
| buffer_size = static_cast<uint32_t>(sizeof(buffer));
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp_1->ReadMessage(1,
|
| buffer, &buffer_size,
|
| - NULL, NULL,
|
| + 0, NULL,
|
| MOJO_READ_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(sizeof(world), static_cast<size_t>(buffer_size));
|
| EXPECT_EQ(0, strcmp(buffer, world));
|
|
|