| Index: mojo/system/dispatcher_unittest.cc
|
| diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc
|
| index 1a7bba5759fca9bfc61f5ac4465276b76ed4aeca..3cce26327ced9dc61d48a84f49c323684e80e482 100644
|
| --- a/mojo/system/dispatcher_unittest.cc
|
| +++ b/mojo/system/dispatcher_unittest.cc
|
| @@ -45,12 +45,12 @@ TEST(DispatcherTest, Basic) {
|
|
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteMessage(
|
| - NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| + NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadMessage(NullUserPointer(),
|
| NullUserPointer(),
|
| - NULL,
|
| - NULL,
|
| + nullptr,
|
| + nullptr,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(
|
| MOJO_RESULT_INVALID_ARGUMENT,
|
| @@ -91,12 +91,12 @@ TEST(DispatcherTest, Basic) {
|
|
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->WriteMessage(
|
| - NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| + NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| d->ReadMessage(NullUserPointer(),
|
| NullUserPointer(),
|
| - NULL,
|
| - NULL,
|
| + nullptr,
|
| + nullptr,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| EXPECT_EQ(
|
| MOJO_RESULT_INVALID_ARGUMENT,
|
| @@ -175,14 +175,14 @@ class ThreadSafetyStressThread : public base::SimpleThread {
|
| EXPECT_EQ(
|
| MOJO_RESULT_INVALID_ARGUMENT,
|
| dispatcher_->WriteMessage(
|
| - NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| + NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| break;
|
| case READ_MESSAGE:
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| dispatcher_->ReadMessage(NullUserPointer(),
|
| NullUserPointer(),
|
| - NULL,
|
| - NULL,
|
| + nullptr,
|
| + nullptr,
|
| MOJO_WRITE_MESSAGE_FLAG_NONE));
|
| break;
|
| case WRITE_DATA:
|
|
|