| Index: mojo/system/dispatcher_unittest.cc
|
| diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
|
| index 46e9e79f6dd51b512c06220164e0622f1fb39488..6d7ead4c4147b81def280858ad7e3a7888ceb0fb 100644
|
| --- a/mojo/system/dispatcher_unittest.cc
|
| +++ b/mojo/system/dispatcher_unittest.cc
|
| @@ -59,7 +59,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->EndWriteData(0));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| + d->ReadData(NullUserPointer(), NullUserPointer(),
|
| + MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->BeginReadData(NullUserPointer(), NullUserPointer(),
|
| MOJO_READ_DATA_FLAG_NONE));
|
| @@ -89,7 +90,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->EndWriteData(0));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| + d->ReadData(NullUserPointer(), NullUserPointer(),
|
| + MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->BeginReadData(NullUserPointer(), NullUserPointer(),
|
| MOJO_READ_DATA_FLAG_NONE));
|
| @@ -175,7 +177,8 @@ class ThreadSafetyStressThread : public base::SimpleThread {
|
| break;
|
| case READ_DATA:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - dispatcher_->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| + dispatcher_->ReadData(NullUserPointer(), NullUserPointer(),
|
| + MOJO_READ_DATA_FLAG_NONE));
|
| break;
|
| case BEGIN_READ_DATA:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
|
|