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

Unified Diff: mojo/system/multiprocess_message_pipe_unittest.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_unittest.cc ('k') | mojo/system/platform_handle_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/multiprocess_message_pipe_unittest.cc
diff --git a/mojo/system/multiprocess_message_pipe_unittest.cc b/mojo/system/multiprocess_message_pipe_unittest.cc
index 7991c28741b9cf77334b19a876011038f6e6f5ee..3d40f33fed5707d6c8c21d376a8e4b7c11856fba 100644
--- a/mojo/system/multiprocess_message_pipe_unittest.cc
+++ b/mojo/system/multiprocess_message_pipe_unittest.cc
@@ -75,8 +75,8 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
CHECK_EQ(mp->ReadMessage(0,
UserPointer<void>(&read_buffer[0]),
MakeUserPointer(&read_buffer_size),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
MOJO_READ_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
read_buffer.resize(read_buffer_size);
@@ -91,7 +91,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
CHECK_EQ(mp->WriteMessage(0,
UserPointer<const void>(write_buffer.data()),
static_cast<uint32_t>(write_buffer.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
}
@@ -113,7 +113,7 @@ TEST_F(MultiprocessMessagePipeTest, Basic) {
mp->WriteMessage(0,
UserPointer<const void>(hello.data()),
static_cast<uint32_t>(hello.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE));
HandleSignalsState hss;
@@ -130,8 +130,8 @@ TEST_F(MultiprocessMessagePipeTest, Basic) {
CHECK_EQ(mp->ReadMessage(0,
UserPointer<void>(&read_buffer[0]),
MakeUserPointer(&read_buffer_size),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
MOJO_READ_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
read_buffer.resize(read_buffer_size);
@@ -160,7 +160,7 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
mp->WriteMessage(0,
UserPointer<const void>(write_buffer.data()),
static_cast<uint32_t>(write_buffer.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE));
}
@@ -169,7 +169,7 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
mp->WriteMessage(0,
UserPointer<const void>(quitquitquit.data()),
static_cast<uint32_t>(quitquitquit.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE));
for (size_t i = 0; i < kNumMessages; i++) {
@@ -187,8 +187,8 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
CHECK_EQ(mp->ReadMessage(0,
UserPointer<void>(&read_buffer[0]),
MakeUserPointer(&read_buffer_size),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
MOJO_READ_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
read_buffer.resize(read_buffer_size);
@@ -272,7 +272,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckSharedBuffer) {
CHECK_EQ(mp->WriteMessage(0,
UserPointer<const void>(&go2[0]),
static_cast<uint32_t>(go2.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
@@ -290,8 +290,8 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckSharedBuffer) {
CHECK_EQ(mp->ReadMessage(0,
UserPointer<void>(&read_buffer[0]),
MakeUserPointer(&num_bytes),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
MOJO_READ_MESSAGE_FLAG_NONE),
MOJO_RESULT_OK);
read_buffer.resize(num_bytes);
@@ -355,7 +355,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) {
transport.End();
EXPECT_TRUE(dispatcher->HasOneRef());
- dispatcher = NULL;
+ dispatcher = nullptr;
// Wait for a message from the child.
HandleSignalsState hss;
@@ -370,8 +370,8 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) {
mp->ReadMessage(0,
UserPointer<void>(&read_buffer[0]),
MakeUserPointer(&num_bytes),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
MOJO_READ_MESSAGE_FLAG_NONE));
read_buffer.resize(num_bytes);
EXPECT_EQ(std::string("go 2"), read_buffer);
@@ -391,7 +391,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) {
mp->WriteMessage(0,
UserPointer<const void>(&go3[0]),
static_cast<uint32_t>(go3.size()),
- NULL,
+ nullptr,
MOJO_WRITE_MESSAGE_FLAG_NONE));
// Wait for |mp| to become readable, which should fail.
@@ -504,7 +504,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_PlatformHandlePassing) {
transport.End();
EXPECT_TRUE(dispatcher->HasOneRef());
- dispatcher = NULL;
+ dispatcher = nullptr;
// Wait for it to become readable, which should fail.
HandleSignalsState hss;
« no previous file with comments | « mojo/system/message_pipe_unittest.cc ('k') | mojo/system/platform_handle_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698