Index: webrtc/base/task_unittest.cc |
diff --git a/webrtc/base/task_unittest.cc b/webrtc/base/task_unittest.cc |
index 38ceb145fddb00550f1bbce2ce535a9f74a1d10a..b26d6706cf6de3b4897f6c30734c63b78dbd5595 100644 |
--- a/webrtc/base/task_unittest.cc |
+++ b/webrtc/base/task_unittest.cc |
@@ -216,7 +216,7 @@ class TaskTest : public sigslot::has_slots<> { |
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 @@ class TaskTest : public sigslot::has_slots<> { |
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 @@ class TaskTest : public sigslot::has_slots<> { |
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 @@ class SetBoolOnDeleteTask : public Task { |
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 @@ class TimeoutChangeTest : public sigslot::has_slots<> { |
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; |
} |
} |