mojo/public/cpp/system/tests/core_unittest.cc - Issue 612243002: Mojo: NULL -> nullptr in mojo/public/cpp outside of bindings.

Unified Diff: mojo/public/cpp/system/tests/core_unittest.cc

Issue 612243002: Mojo: NULL -> nullptr in mojo/public/cpp outside of bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

Index: mojo/public/cpp/system/tests/core_unittest.cc

diff --git a/mojo/public/cpp/system/tests/core_unittest.cc b/mojo/public/cpp/system/tests/core_unittest.cc

index a4cddbf62cfe522dee6c181acbda4b9362614459..a44bc07666914b06b2842dcba4d5f5c4b55caf9f 100644

--- a/mojo/public/cpp/system/tests/core_unittest.cc

+++ b/mojo/public/cpp/system/tests/core_unittest.cc

@@ -124,25 +124,25 @@ TEST(CoreCppTest, Basic) {

EXPECT_FALSE(h_invalid.is_valid());

EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,

WriteMessageRaw(h_invalid,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

char buffer[10] = { 0 };

EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,

WriteMessageRaw(h_invalid,

buffer, sizeof(buffer),

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,

ReadMessageRaw(h_invalid,

- NULL, NULL,

+ nullptr, nullptr,

MOJO_READ_MESSAGE_FLAG_NONE));

uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));

EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,

ReadMessageRaw(h_invalid,

buffer, &buffer_size,

- NULL, NULL,

+ nullptr, nullptr,

MOJO_READ_MESSAGE_FLAG_NONE));

// Basic tests of waiting and closing.

@@ -153,7 +153,7 @@ TEST(CoreCppTest, Basic) {

EXPECT_FALSE(h0.get().is_valid());

EXPECT_FALSE(h1.get().is_valid());

- CreateMessagePipe(NULL, &h0, &h1);

+ CreateMessagePipe(nullptr, &h0, &h1);

EXPECT_TRUE(h0.get().is_valid());

EXPECT_TRUE(h1.get().is_valid());

EXPECT_NE(h0.get().value(), h1.get().value());

@@ -193,14 +193,14 @@ TEST(CoreCppTest, Basic) {

{

ScopedMessagePipeHandle h0;

ScopedMessagePipeHandle h1;

- CreateMessagePipe(NULL, &h0, &h1);

+ CreateMessagePipe(nullptr, &h0, &h1);

const char kHello[] = "hello";

const uint32_t kHelloSize = static_cast<uint32_t>(sizeof(kHello));

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(h0.get(),

kHello, kHelloSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

EXPECT_EQ(MOJO_RESULT_OK,

Wait(h1.get(), MOJO_HANDLE_SIGNAL_READABLE,

@@ -210,7 +210,7 @@ TEST(CoreCppTest, Basic) {

EXPECT_EQ(MOJO_RESULT_OK,

ReadMessageRaw(h1.get(),

buffer, &buffer_size,

- NULL, NULL,

+ nullptr, nullptr,

MOJO_READ_MESSAGE_FLAG_NONE));

EXPECT_EQ(kHelloSize, buffer_size);

EXPECT_STREQ(kHello, buffer);

@@ -226,7 +226,7 @@ TEST(CoreCppTest, Basic) {

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(mp.handle0.get(),

kWorld, kWorldSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

// Send |mp.handle1| over |h1| to |h0|.

@@ -296,12 +296,12 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {

{

ScopedMessagePipeHandle h0;

ScopedMessagePipeHandle h1;

- CreateMessagePipe(NULL, &h0, &h1);

+ CreateMessagePipe(nullptr, &h0, &h1);

// Send a handle over the previously-establish message pipe.

ScopedMessagePipeHandle h2;

ScopedMessagePipeHandle h3;

- CreateMessagePipe(NULL, &h2, &h3);

+ CreateMessagePipe(nullptr, &h2, &h3);

// Write a message to |h2|, before we send |h3|.

const char kWorld[] = "world!";

@@ -309,13 +309,13 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(h2.get(),

kWorld, kWorldSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

// And also a message to |h3|.

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(h3.get(),

kWorld, kWorldSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

// Send |h3| over |h1| to |h0|.

@@ -343,12 +343,12 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {

{

ScopedMessagePipeHandle h0;

ScopedMessagePipeHandle h1;

- CreateMessagePipe(NULL, &h0, &h1);

+ CreateMessagePipe(nullptr, &h0, &h1);

// Send a handle over the previously-establish message pipe.

ScopedMessagePipeHandle h2;

ScopedMessagePipeHandle h3;

- CreateMessagePipe(NULL, &h2, &h3);

+ CreateMessagePipe(nullptr, &h2, &h3);

// Write a message to |h2|, before we send |h3|.

const char kWorld[] = "world!";

@@ -356,13 +356,13 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(h2.get(),

kWorld, kWorldSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

// And also a message to |h3|.

EXPECT_EQ(MOJO_RESULT_OK,

WriteMessageRaw(h3.get(),

kWorld, kWorldSize,

- NULL, 0,

+ nullptr, 0,

MOJO_WRITE_MESSAGE_FLAG_NONE));

// Send |h3| over |h1| to |h0|.

@@ -388,11 +388,11 @@ TEST(CoreCppTest, TearDownWithMessagesEnqueued) {

TEST(CoreCppTest, ScopedHandleMoveCtor) {

ScopedSharedBufferHandle buffer1;

- EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(NULL, 1024, &buffer1));

+ EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(nullptr, 1024, &buffer1));

EXPECT_TRUE(buffer1.is_valid());

ScopedSharedBufferHandle buffer2;

- EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(NULL, 1024, &buffer2));

+ EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(nullptr, 1024, &buffer2));

EXPECT_TRUE(buffer2.is_valid());

// If this fails to close buffer1, ScopedHandleBase::CloseIfNecessary() will

@@ -405,7 +405,7 @@ TEST(CoreCppTest, ScopedHandleMoveCtor) {

TEST(CoreCppTest, ScopedHandleMoveCtorSelf) {

ScopedSharedBufferHandle buffer1;

- EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(NULL, 1024, &buffer1));

+ EXPECT_EQ(MOJO_RESULT_OK, CreateSharedBuffer(nullptr, 1024, &buffer1));

EXPECT_TRUE(buffer1.is_valid());

buffer1 = buffer1.Pass();

« no previous file with comments | « mojo/public/cpp/system/message_pipe.h ('k') | mojo/public/cpp/test_support/lib/test_support.cc » ('j') | no next file with comments »