| Index: cc/resources/tile_manager_unittest.cc
|
| diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
|
| index fb2c823a115bf060b53ac9a62dfd7c4b610983c2..ef9ea47d4fbdf976f18dcb463067ee8bde7e556b 100644
|
| --- a/cc/resources/tile_manager_unittest.cc
|
| +++ b/cc/resources/tile_manager_unittest.cc
|
| @@ -78,7 +78,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test {
|
| void ActivateTree() {
|
| host_impl_.ActivateSyncTree();
|
| CHECK(!host_impl_.pending_tree());
|
| - pending_layer_ = NULL;
|
| + pending_layer_ = nullptr;
|
| active_layer_ = static_cast<FakePictureLayerImpl*>(
|
| host_impl_.active_tree()->LayerById(id_));
|
| }
|
| @@ -218,7 +218,7 @@ TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueue) {
|
| for (size_t i = 0; i < active_low_res_tiles.size(); ++i)
|
| all_tiles.insert(active_low_res_tiles[i]);
|
|
|
| - Tile* last_tile = NULL;
|
| + Tile* last_tile = nullptr;
|
| smoothness_tiles.clear();
|
| tile_count = 0;
|
| size_t increasing_distance_tiles = 0u;
|
| @@ -261,7 +261,7 @@ TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueue) {
|
| EXPECT_GT(increasing_distance_tiles, 3 * tile_count / 4);
|
|
|
| std::set<Tile*> new_content_tiles;
|
| - last_tile = NULL;
|
| + last_tile = nullptr;
|
| increasing_distance_tiles = 0u;
|
| // Here we expect to get increasing PENDING_TREE priority_bin.
|
| queue.Reset();
|
| @@ -396,7 +396,7 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
|
| tile_manager()->InitializeTilesWithResourcesForTesting(
|
| std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
|
|
|
| - Tile* last_tile = NULL;
|
| + Tile* last_tile = nullptr;
|
| smoothness_tiles.clear();
|
| tile_count = 0;
|
| // Here we expect to get increasing ACTIVE_TREE priority_bin.
|
| @@ -433,7 +433,7 @@ TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
|
| EXPECT_EQ(all_tiles, smoothness_tiles);
|
|
|
| std::set<Tile*> new_content_tiles;
|
| - last_tile = NULL;
|
| + last_tile = nullptr;
|
| // Here we expect to get increasing PENDING_TREE priority_bin.
|
| queue.Reset();
|
| host_impl_.BuildEvictionQueue(&queue, NEW_CONTENT_TAKES_PRIORITY);
|
| @@ -543,7 +543,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
|
| // Verify occlusion is considered by EvictionTilePriorityQueue.
|
| TreePriority tree_priority = NEW_CONTENT_TAKES_PRIORITY;
|
| size_t occluded_count = 0u;
|
| - Tile* last_tile = NULL;
|
| + Tile* last_tile = nullptr;
|
| EvictionTilePriorityQueue queue;
|
| host_impl_.BuildEvictionQueue(&queue, tree_priority);
|
| while (!queue.IsEmpty()) {
|
|
|