| Index: mojo/system/message_pipe_test_utils.cc
|
| diff --git a/mojo/system/message_pipe_test_utils.cc b/mojo/system/message_pipe_test_utils.cc
|
| index c70f0a0c2afd54c802de64decc61f35f4f4ba6e5..3c0a8ccd6f165f88dee0572460ca39233cb75fde 100644
|
| --- a/mojo/system/message_pipe_test_utils.cc
|
| +++ b/mojo/system/message_pipe_test_utils.cc
|
| @@ -27,7 +27,7 @@ MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp,
|
| : add_result;
|
| }
|
|
|
| - MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE, NULL);
|
| + MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr);
|
| mp->RemoveWaiter(0, &waiter, signals_state);
|
| return wait_result;
|
| }
|
| @@ -94,7 +94,7 @@ void ChannelThread::InitChannelOnIOThread(
|
| void ChannelThread::ShutdownChannelOnIOThread() {
|
| CHECK(channel_.get());
|
| channel_->Shutdown();
|
| - channel_ = NULL;
|
| + channel_ = nullptr;
|
| }
|
|
|
| #if !defined(OS_IOS)
|
|
|