commit 37f5ecfd8f3337475872c9242221471784894f1c
author deadbeef <deadbeef@webrtc.org> Mon Feb 27 14:06:41 2017 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 27 22:06:41 2017 +0000
tree dfd792b3d1ba6fbd819a3afedd1eb110e58a6d9e
parent c5da4785f346dc32e6219fa689d6cd619e55f114

Replace NULL with nullptr or null in webrtc/base/.

BUG=webrtc:7147

Review-Url: https://codereview.webrtc.org/2718663005
Cr-Commit-Position: refs/heads/master@{#16878}

webrtc/base/fileutils_unittest.cc

diff --git a/webrtc/base/fileutils_unittest.cc b/webrtc/base/fileutils_unittest.cc
index 068d60e..a4e2850 100644
--- a/webrtc/base/fileutils_unittest.cc
+++ b/webrtc/base/fileutils_unittest.cc
@@ -27,13 +27,13 @@
 // Make sure we can get a temp folder for the later tests.
 TEST(MAYBE_FilesystemTest, GetTemporaryFolder) {
   Pathname path;
-  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
+  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, nullptr));
 }
 
 // Test creating a temp file, reading it back in, and deleting it.
 TEST(MAYBE_FilesystemTest, TestOpenFile) {
   Pathname path;
-  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
+  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, nullptr));
   path.SetPathname(Filesystem::TempFilename(path, "ut"));
 
   FileStream* fs;
@@ -41,16 +41,16 @@
   size_t bytes;
 
   fs = Filesystem::OpenFile(path, "wb");
-  ASSERT_TRUE(fs != NULL);
-  EXPECT_EQ(SR_SUCCESS, fs->Write("test", 4, &bytes, NULL));
+  ASSERT_TRUE(fs != nullptr);
+  EXPECT_EQ(SR_SUCCESS, fs->Write("test", 4, &bytes, nullptr));
   EXPECT_EQ(4U, bytes);
   delete fs;
 
   EXPECT_TRUE(Filesystem::IsFile(path));
 
   fs = Filesystem::OpenFile(path, "rb");
-  ASSERT_TRUE(fs != NULL);
-  EXPECT_EQ(SR_SUCCESS, fs->Read(buf, sizeof(buf), &bytes, NULL));
+  ASSERT_TRUE(fs != nullptr);
+  EXPECT_EQ(SR_SUCCESS, fs->Read(buf, sizeof(buf), &bytes, nullptr));
   EXPECT_EQ(4U, bytes);
   delete fs;
 
@@ -61,13 +61,13 @@
 // Test opening a non-existent file.
 TEST(MAYBE_FilesystemTest, TestOpenBadFile) {
   Pathname path;
-  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
+  EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, nullptr));
   path.SetFilename("not an actual file");
 
   EXPECT_FALSE(Filesystem::IsFile(path));
 
   FileStream* fs = Filesystem::OpenFile(path, "rb");
-  EXPECT_FALSE(fs != NULL);
+  EXPECT_FALSE(fs != nullptr);
 }
 
 }  // namespace rtc