Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1446)

Unified Diff: cc/scheduler/delay_based_time_source_unittest.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/scheduler/delay_based_time_source_unittest.cc
diff --git a/cc/scheduler/delay_based_time_source_unittest.cc b/cc/scheduler/delay_based_time_source_unittest.cc
index 0af8b02f4b9a1ad880a4089a4626a9c9e769ae7c..e28aaa08a162c61820c74856b73e076475ff0927 100644
--- a/cc/scheduler/delay_based_time_source_unittest.cc
+++ b/cc/scheduler/delay_based_time_source_unittest.cc
@@ -452,7 +452,7 @@ TEST(DelayBasedTimeSourceTest, TestDeactivateWhilePending) {
timer->SetClient(&client);
timer->SetActive(true); // Should post a task.
timer->SetActive(false);
- timer = NULL;
+ timer = nullptr;
// Should run the posted task without crashing.
EXPECT_TRUE(task_runner->HasPendingTask());
task_runner->RunPendingTasks();

Powered by Google App Engine
This is Rietveld 408576698