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

Unified Diff: mojo/system/shared_buffer_dispatcher.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/remote_message_pipe_unittest.cc ('k') | mojo/system/simple_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/shared_buffer_dispatcher.cc
diff --git a/mojo/system/shared_buffer_dispatcher.cc b/mojo/system/shared_buffer_dispatcher.cc
index bf882ba7817ec12b1109d1d9354eb1d3569b7b52..6229f089bef1b5908ce3204132499e1afd3d26fb 100644
--- a/mojo/system/shared_buffer_dispatcher.cc
+++ b/mojo/system/shared_buffer_dispatcher.cc
@@ -180,7 +180,7 @@ MojoResult SharedBufferDispatcher::ValidateDuplicateOptions(
void SharedBufferDispatcher::CloseImplNoLock() {
lock().AssertAcquired();
DCHECK(shared_buffer_.get());
- shared_buffer_ = NULL;
+ shared_buffer_ = nullptr;
}
scoped_refptr<Dispatcher>
@@ -258,7 +258,7 @@ bool SharedBufferDispatcher::EndSerializeAndCloseImplNoLock(
shared_buffer_->HasOneRef() ? shared_buffer_->PassPlatformHandle()
: shared_buffer_->DuplicatePlatformHandle());
if (!platform_handle.is_valid()) {
- shared_buffer_ = NULL;
+ shared_buffer_ = nullptr;
return false;
}
@@ -267,7 +267,7 @@ bool SharedBufferDispatcher::EndSerializeAndCloseImplNoLock(
platform_handles->push_back(platform_handle.release());
*actual_size = sizeof(SerializedSharedBufferDispatcher);
- shared_buffer_ = NULL;
+ shared_buffer_ = nullptr;
return true;
}
« no previous file with comments | « mojo/system/remote_message_pipe_unittest.cc ('k') | mojo/system/simple_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698