commit 37f5ecfd8f3337475872c9242221471784894f1c
author deadbeef <deadbeef@webrtc.org> Mon Feb 27 22:06:41 2017
committer Commit bot <commit-bot@chromium.org> Mon Feb 27 22:06:41 2017
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/base64_unittest.cc

diff --git a/webrtc/base/base64_unittest.cc b/webrtc/base/base64_unittest.cc
index 96bc695..6bfba79 100644
--- a/webrtc/base/base64_unittest.cc
+++ b/webrtc/base/base64_unittest.cc
@@ -339,14 +339,14 @@
 size_t Base64Unescape(const char *src, size_t szsrc, char *dest,
                       size_t szdest) {
   std::string unescaped;
-  EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, &unescaped,
-                                      NULL));
+  EXPECT_TRUE(
+      Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, &unescaped, nullptr));
   memcpy(dest, unescaped.data(), min(unescaped.size(), szdest));
   return unescaped.size();
 }
 
 size_t Base64Unescape(const char *src, size_t szsrc, std::string *s) {
-  EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, NULL));
+  EXPECT_TRUE(Base64::DecodeFromArray(src, szsrc, Base64::DO_LAX, s, nullptr));
   return s->size();
 }
 
@@ -995,5 +995,5 @@
   EXPECT_TRUE(Base64::GetNextBase64Char('/', &next_char));
   EXPECT_EQ('A', next_char);
   EXPECT_FALSE(Base64::GetNextBase64Char('&', &next_char));
-  EXPECT_FALSE(Base64::GetNextBase64Char('Z', NULL));
+  EXPECT_FALSE(Base64::GetNextBase64Char('Z', nullptr));
 }