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/messagequeue_unittest.cc

diff --git a/webrtc/base/messagequeue_unittest.cc b/webrtc/base/messagequeue_unittest.cc
index 8834ab5..9652bb3 100644
--- a/webrtc/base/messagequeue_unittest.cc
+++ b/webrtc/base/messagequeue_unittest.cc
@@ -57,13 +57,13 @@
 
 static void DelayedPostsWithIdenticalTimesAreProcessedInFifoOrder(
     MessageQueue* q) {
-  EXPECT_TRUE(q != NULL);
+  EXPECT_TRUE(q != nullptr);
   int64_t now = TimeMillis();
-  q->PostAt(RTC_FROM_HERE, now, NULL, 3);
-  q->PostAt(RTC_FROM_HERE, now - 2, NULL, 0);
-  q->PostAt(RTC_FROM_HERE, now - 1, NULL, 1);
-  q->PostAt(RTC_FROM_HERE, now, NULL, 4);
-  q->PostAt(RTC_FROM_HERE, now - 1, NULL, 2);
+  q->PostAt(RTC_FROM_HERE, now, nullptr, 3);
+  q->PostAt(RTC_FROM_HERE, now - 2, nullptr, 0);
+  q->PostAt(RTC_FROM_HERE, now - 1, nullptr, 1);
+  q->PostAt(RTC_FROM_HERE, now, nullptr, 4);
+  q->PostAt(RTC_FROM_HERE, now - 1, nullptr, 2);
 
   Message msg;
   for (size_t i=0; i<5; ++i) {
@@ -120,7 +120,7 @@
 }
 
 struct UnwrapMainThreadScope {
-  UnwrapMainThreadScope() : rewrap_(Thread::Current() != NULL) {
+  UnwrapMainThreadScope() : rewrap_(Thread::Current() != nullptr) {
     if (rewrap_) ThreadManager::Instance()->UnwrapCurrentThread();
   }
   ~UnwrapMainThreadScope() {