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

Unified Diff: cc/trees/layer_tree_host_unittest_copyrequest.cc

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/trees/layer_tree_host_unittest_copyrequest.cc
diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc
index 860f2831bd5b1536c6efbf90bc53872e16fb4ea1..317ec68fb1d620a48c0f4b5374d6855d8e36f880 100644
--- a/cc/trees/layer_tree_host_unittest_copyrequest.cc
+++ b/cc/trees/layer_tree_host_unittest_copyrequest.cc
@@ -183,9 +183,9 @@ class LayerTreeHostCopyRequestTestLayerDestroyed
// Destroy the main thread layer right away.
main_destroyed_->RemoveFromParent();
- main_destroyed_ = NULL;
+ main_destroyed_ = nullptr;
- // Should callback with a NULL bitmap.
+ // Should callback with a nullptr bitmap.
EXPECT_EQ(1, callback_count_);
// Prevent drawing so we can't make a copy of the impl_destroyed layer.
@@ -201,7 +201,7 @@ class LayerTreeHostCopyRequestTestLayerDestroyed
// Destroy the impl thread layer.
impl_destroyed_->RemoveFromParent();
- impl_destroyed_ = NULL;
+ impl_destroyed_ = nullptr;
// No callback yet because it's on the impl side.
EXPECT_EQ(1, callback_count_);
@@ -211,7 +211,7 @@ class LayerTreeHostCopyRequestTestLayerDestroyed
layer_tree_host()->SetNeedsCommit();
break;
case 5:
- // We should get another callback with a NULL bitmap.
+ // We should get another callback with a nullptr bitmap.
EXPECT_EQ(2, callback_count_);
EndTest();
break;

Powered by Google App Engine
This is Rietveld 408576698