Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / system / dispatcher_unittest.cc

diff --git a/src/mojo/system/dispatcher_unittest.cc b/src/mojo/system/dispatcher_unittest.cc
index 1a7bba5..3cce263 100644 (file)
--- a/src/mojo/system/dispatcher_unittest.cc
+++ b/src/mojo/system/dispatcher_unittest.cc
@@ -45,12 +45,12 @@ TEST(DispatcherTest, Basic) {
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteMessage(
-                NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
+                NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadMessage(NullUserPointer(),
                            NullUserPointer(),
-                           NULL,
-                           NULL,
+                           nullptr,
+                           nullptr,
                            MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(
       MOJO_RESULT_INVALID_ARGUMENT,
@@ -91,12 +91,12 @@ TEST(DispatcherTest, Basic) {
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteMessage(
-                NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
+                NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadMessage(NullUserPointer(),
                            NullUserPointer(),
-                           NULL,
-                           NULL,
+                           nullptr,
+                           nullptr,
                            MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(
       MOJO_RESULT_INVALID_ARGUMENT,
@@ -175,14 +175,14 @@ class ThreadSafetyStressThread : public base::SimpleThread {
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher_->WriteMessage(
-                NullUserPointer(), 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
+                NullUserPointer(), 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
         break;
       case READ_MESSAGE:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
                   dispatcher_->ReadMessage(NullUserPointer(),
                                            NullUserPointer(),
-                                           NULL,
-                                           NULL,
+                                           nullptr,
+                                           nullptr,
                                            MOJO_WRITE_MESSAGE_FLAG_NONE));
         break;
       case WRITE_DATA: