| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index 9766df61665a75adce91e44887e3d7061e291251..ffd78e5c2285ff8267bd53065d0cb9bbdfc72a2a 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -137,7 +137,7 @@ class TileManagerPerfTest : public testing::Test {
|
| void ActivateTree() {
|
| host_impl_.ActivateSyncTree();
|
| CHECK(!host_impl_.pending_tree());
|
| - pending_root_layer_ = NULL;
|
| + pending_root_layer_ = nullptr;
|
| active_root_layer_ = static_cast<FakePictureLayerImpl*>(
|
| host_impl_.active_tree()->LayerById(id_));
|
| }
|
| @@ -230,7 +230,7 @@ class TileManagerPerfTest : public testing::Test {
|
| host_impl_.BuildRasterQueue(&queue, priorities[priority_count]);
|
| while (count--) {
|
| ASSERT_FALSE(queue.IsEmpty());
|
| - ASSERT_TRUE(queue.Top() != NULL);
|
| + ASSERT_TRUE(queue.Top() != nullptr);
|
| queue.Pop();
|
| }
|
| priority_count = (priority_count + 1) % arraysize(priorities);
|
| @@ -308,7 +308,7 @@ class TileManagerPerfTest : public testing::Test {
|
| host_impl_.BuildEvictionQueue(&queue, priorities[priority_count]);
|
| while (count--) {
|
| ASSERT_FALSE(queue.IsEmpty());
|
| - ASSERT_TRUE(queue.Top() != NULL);
|
| + ASSERT_TRUE(queue.Top() != nullptr);
|
| queue.Pop();
|
| }
|
| priority_count = (priority_count + 1) % arraysize(priorities);
|
|
|