Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / embedder / platform_channel_pair_posix_unittest.cc

diff --git a/src/mojo/embedder/platform_channel_pair_posix_unittest.cc b/src/mojo/embedder/platform_channel_pair_posix_unittest.cc
index db1af39..523b767 100644 (file)
--- a/src/mojo/embedder/platform_channel_pair_posix_unittest.cc
+++ b/src/mojo/embedder/platform_channel_pair_posix_unittest.cc
@@ -15,8 +15,8 @@
 
 #include <deque>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
@@ -53,7 +53,7 @@ class PlatformChannelPairPosixTest : public testing::Test {
 
   virtual void TearDown() OVERRIDE {
     // Restore the |SIGPIPE| handler.
-    ASSERT_EQ(0, sigaction(SIGPIPE, &old_action_, NULL));
+    ASSERT_EQ(0, sigaction(SIGPIPE, &old_action_, nullptr));
   }
 
  private: