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

Unified Diff: cc/layers/heads_up_display_unittest.cc

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foramted. 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/layers/heads_up_display_unittest.cc
diff --git a/cc/layers/heads_up_display_unittest.cc b/cc/layers/heads_up_display_unittest.cc
index 686338e048573c3146183517bdc1f81883b8d7fa..37d40a87078e9c813c31d775f5ff065e6bff8ada 100644
--- a/cc/layers/heads_up_display_unittest.cc
+++ b/cc/layers/heads_up_display_unittest.cc
@@ -57,7 +57,7 @@ class HudWithRootLayerChange : public HeadsUpDisplayTest {
case 2:
EXPECT_EQ(root_layer1_.get(), layer_tree_host()->hud_layer()->parent());
// Unset the root layer.
- layer_tree_host()->SetRootLayer(NULL);
+ layer_tree_host()->SetRootLayer(nullptr);
break;
case 3:
EXPECT_EQ(0, layer_tree_host()->hud_layer()->parent());
@@ -67,7 +67,7 @@ class HudWithRootLayerChange : public HeadsUpDisplayTest {
case 4:
EXPECT_EQ(root_layer1_.get(), layer_tree_host()->hud_layer()->parent());
// Unset the root layer.
- layer_tree_host()->SetRootLayer(NULL);
+ layer_tree_host()->SetRootLayer(nullptr);
break;
case 5:
EXPECT_EQ(0, layer_tree_host()->hud_layer()->parent());
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.cc ('k') | cc/layers/layer.h » ('j') | cc/layers/layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698