| Index: mojo/system/dispatcher_unittest.cc
|
| diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
|
| index f301f9003619e2a19f6036df442fa5684498e44a..4f7b5db8f1fcb6606f94af7897a859088ba9783d 100644
|
| --- a/mojo/system/dispatcher_unittest.cc
|
| +++ b/mojo/system/dispatcher_unittest.cc
|
| @@ -48,7 +48,7 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteMessage(NULL, 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->ReadMessage(NULL, NULL, NULL, NULL,
|
| + d->ReadMessage(NullUserPointer(), NullUserPointer(), NULL, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteData(NULL, NULL, MOJO_WRITE_DATA_FLAG_NONE));
|
| @@ -77,7 +77,7 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteMessage(NULL, 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->ReadMessage(NULL, NULL, NULL, NULL,
|
| + d->ReadMessage(NullUserPointer(), NullUserPointer(), NULL, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteData(NULL, NULL, MOJO_WRITE_DATA_FLAG_NONE));
|
| @@ -152,7 +152,8 @@ class ThreadSafetyStressThread : public base::SimpleThread {
|
| break;
|
| case READ_MESSAGE:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - dispatcher_->ReadMessage(NULL, NULL, NULL, NULL,
|
| + dispatcher_->ReadMessage(NullUserPointer(), NullUserPointer(),
|
| + NULL, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| break;
|
| case WRITE_DATA:
|
|
|