Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: mojo/system/message_pipe_test_utils.cc

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/system/message_pipe_perftest.cc ('k') | mojo/system/message_pipe_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « mojo/system/message_pipe_perftest.cc ('k') | mojo/system/message_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698