| Index: mojo/system/dispatcher_unittest.cc
|
| diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
|
| index 4f7b5db8f1fcb6606f94af7897a859088ba9783d..46e9e79f6dd51b512c06220164e0622f1fb39488 100644
|
| --- a/mojo/system/dispatcher_unittest.cc
|
| +++ b/mojo/system/dispatcher_unittest.cc
|
| @@ -46,7 +46,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(Dispatcher::kTypeUnknown, d->GetType());
|
|
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->WriteMessage(NULL, 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| + d->WriteMessage(NullUserPointer(), 0, NULL,
|
| + MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadMessage(NullUserPointer(), NullUserPointer(), NULL, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| @@ -75,7 +76,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_OK, d->Close());
|
|
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->WriteMessage(NULL, 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| + d->WriteMessage(NullUserPointer(), 0, NULL,
|
| + MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadMessage(NullUserPointer(), NullUserPointer(), NULL, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| @@ -147,7 +149,7 @@ class ThreadSafetyStressThread : public base::SimpleThread {
|
| }
|
| case WRITE_MESSAGE:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - dispatcher_->WriteMessage(NULL, 0, NULL,
|
| + dispatcher_->WriteMessage(NullUserPointer(), 0, NULL,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| break;
|
| case READ_MESSAGE:
|
|
|