| Index: mojo/system/dispatcher_unittest.cc
|
| diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
|
| index abe1886dc5fcf537666efe6c5e2e9fc64c702620..f301f9003619e2a19f6036df442fa5684498e44a 100644
|
| --- a/mojo/system/dispatcher_unittest.cc
|
| +++ b/mojo/system/dispatcher_unittest.cc
|
| @@ -60,7 +60,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->BeginReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| + d->BeginReadData(NullUserPointer(), NullUserPointer(),
|
| + MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->EndReadData(0));
|
| Waiter w;
|
| @@ -88,7 +89,8 @@ TEST(DispatcherTest, Basic) {
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - d->BeginReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
|
| + d->BeginReadData(NullUserPointer(), NullUserPointer(),
|
| + MOJO_READ_DATA_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->EndReadData(0));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| @@ -174,7 +176,8 @@ class ThreadSafetyStressThread : public base::SimpleThread {
|
| break;
|
| case BEGIN_READ_DATA:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| - dispatcher_->BeginReadData(NULL, NULL,
|
| + dispatcher_->BeginReadData(NullUserPointer(),
|
| + NullUserPointer(),
|
| MOJO_READ_DATA_FLAG_NONE));
|
| break;
|
| case END_READ_DATA:
|
|
|