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

diff --git a/webrtc/base/task_unittest.cc b/webrtc/base/task_unittest.cc
index 38ceb14..b26d670 100644
--- a/webrtc/base/task_unittest.cc
+++ b/webrtc/base/task_unittest.cc
@@ -216,7 +216,7 @@
     for (i = 0; i < STUCK_TASK_COUNT; ++i) {
       if (stuck_[i].xlat_ == id) {
         stuck_[i].timed_out_ = true;
-        stuck_[i].task_ = NULL;
+        stuck_[i].task_ = nullptr;
         break;
       }
     }
@@ -231,7 +231,7 @@
     for (i = 0; i < HAPPY_TASK_COUNT; ++i) {
       if (happy_[i].xlat_ == id) {
         happy_[i].timed_out_ = true;
-        happy_[i].task_ = NULL;
+        happy_[i].task_ = nullptr;
         break;
       }
     }
@@ -245,7 +245,7 @@
     int i;
     for (i = 0; i < HAPPY_TASK_COUNT; ++i) {
       if (happy_[i].xlat_ == id) {
-        happy_[i].task_ = NULL;
+        happy_[i].task_ = nullptr;
         break;
       }
     }
@@ -347,7 +347,7 @@
   SetBoolOnDeleteTask(TaskParent *parent, bool *set_when_deleted)
     : Task(parent),
       set_when_deleted_(set_when_deleted) {
-    EXPECT_TRUE(NULL != set_when_deleted);
+    EXPECT_TRUE(nullptr != set_when_deleted);
     EXPECT_FALSE(*set_when_deleted);
   }
 
@@ -466,7 +466,7 @@
     for (size_t i = 0; i < arraysize(stuck_tasks_); ++i) {
       if (stuck_tasks_[i] && stuck_tasks_[i]->unique_id() == id) {
         task_count_--;
-        stuck_tasks_[i] = NULL;
+        stuck_tasks_[i] = nullptr;
         break;
       }
     }