Index: cc/layers/picture_layer_impl_perftest.cc |
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc |
index 7d874245168deb47dcb4f39f4fb8b2d5505503de..aeea2bb7fee2f8f68623911711864c12755bb6df 100644 |
--- a/cc/layers/picture_layer_impl_perftest.cc |
+++ b/cc/layers/picture_layer_impl_perftest.cc |
@@ -80,7 +80,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
PictureLayerImpl::LayerRasterTileIterator it(pending_layer_, false); |
while (count--) { |
ASSERT_TRUE(it) << "count: " << count; |
- ASSERT_TRUE(*it != NULL) << "count: " << count; |
+ ASSERT_TRUE(*it != nullptr) << "count: " << count; |
++it; |
} |
timer_.NextLap(); |
@@ -133,7 +133,7 @@ class PictureLayerImplPerfTest : public testing::Test { |
pending_layer_, priorities[priority_count]); |
while (count--) { |
ASSERT_TRUE(it) << "count: " << count; |
- ASSERT_TRUE(*it != NULL) << "count: " << count; |
+ ASSERT_TRUE(*it != nullptr) << "count: " << count; |
++it; |
} |
priority_count = (priority_count + 1) % arraysize(priorities); |
@@ -237,7 +237,7 @@ TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstructAndIterate) { |
AddTiling(1.0f, pending_layer_, &all_tiles); |
AddTiling(2.0f, pending_layer_, &all_tiles); |
- ASSERT_TRUE(host_impl_.tile_manager() != NULL); |
+ ASSERT_TRUE(host_impl_.tile_manager() != nullptr); |
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles); |
RunEvictionIteratorConstructAndIterateTest( |
@@ -262,7 +262,7 @@ TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstruct) { |
AddTiling(1.0f, pending_layer_, &all_tiles); |
AddTiling(2.0f, pending_layer_, &all_tiles); |
- ASSERT_TRUE(host_impl_.tile_manager() != NULL); |
+ ASSERT_TRUE(host_impl_.tile_manager() != nullptr); |
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles); |
RunEvictionIteratorConstructTest("0_0_100x100", gfx::Rect(0, 0, 100, 100)); |