cc: Split RasterTilePriorityQueue into required and all based on type.

cc/resources/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/eviction_tile_priority_queue.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/begin_frame_args_test.h"
@@ skipping 133 matching lines @@
   FakeLayerTreeHostImpl host_impl_;
   FakePictureLayerImpl* pending_layer_;
   FakePictureLayerImpl* active_layer_;
 };
 
 TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueue) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
-  RasterTilePriorityQueue queue;
-  host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  EXPECT_FALSE(queue.IsEmpty());
+  scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
+  EXPECT_FALSE(queue->IsEmpty());
 
   size_t tile_count = 0;
   std::set<Tile*> all_tiles;
-  while (!queue.IsEmpty()) {
-    EXPECT_TRUE(queue.Top());
-    all_tiles.insert(queue.Top());
+  while (!queue->IsEmpty()) {
+    EXPECT_TRUE(queue->Top());
+    all_tiles.insert(queue->Top());
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   // Sanity check, all tiles should be visible.
   std::set<Tile*> smoothness_tiles;
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, SMOOTHNESS_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::ALL);
+  queue.reset(host_impl_.BuildRasterQueue(SMOOTHNESS_TAKES_PRIORITY,

[danakj, 2015/01/22 20:24:16]

why not queue = 

[vmpstr, 2015/01/22 22:44:35]

Done.

+                                          RasterTilePriorityQueue::Type::ALL)
+                  .release());
   bool had_low_res = false;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
     EXPECT_EQ(TilePriority::NOW, tile->priority(ACTIVE_TREE).priority_bin);
     EXPECT_EQ(TilePriority::NOW, tile->priority(PENDING_TREE).priority_bin);
     if (tile->priority(ACTIVE_TREE).resolution == LOW_RESOLUTION)
       had_low_res = true;
     else
       smoothness_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(all_tiles, smoothness_tiles);
   EXPECT_TRUE(had_low_res);
 
   // Check that everything is required for activation.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(
-      &queue, SMOOTHNESS_TAKES_PRIORITY,
-      RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION);
+  queue.reset(

[danakj, 2015/01/22 20:24:16]

dittos throughout

[vmpstr, 2015/01/22 22:44:35]

Done.

+      host_impl_.BuildRasterQueue(
+                     SMOOTHNESS_TAKES_PRIORITY,
+                     RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION)
+          .release());
   std::set<Tile*> required_for_activation_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_activation());
     required_for_activation_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(all_tiles, required_for_activation_tiles);
 
   // Check that everything is required for draw.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, SMOOTHNESS_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW);
+  queue.reset(host_impl_.BuildRasterQueue(
+                             SMOOTHNESS_TAKES_PRIORITY,
+                             RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW)
+                  .release());
   std::set<Tile*> required_for_draw_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_draw());
     required_for_draw_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(all_tiles, required_for_draw_tiles);
 
   Region invalidation(gfx::Rect(0, 0, 500, 500));
 
   // Invalidate the pending tree.
   pending_layer_->set_invalidation(invalidation);
   pending_layer_->HighResTiling()->Invalidate(invalidation);
   pending_layer_->LowResTiling()->Invalidate(invalidation);
 
@@ skipping 36 matching lines @@
   std::vector<Tile*> active_low_res_tiles =
       active_layer_->LowResTiling()->AllTilesForTesting();
   for (size_t i = 0; i < active_low_res_tiles.size(); ++i)
     all_tiles.insert(active_low_res_tiles[i]);
 
   Tile* last_tile = NULL;
   smoothness_tiles.clear();
   tile_count = 0;
   size_t correct_order_tiles = 0u;
   // Here we expect to get increasing ACTIVE_TREE priority_bin.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, SMOOTHNESS_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::ALL);
+  queue.reset(host_impl_.BuildRasterQueue(SMOOTHNESS_TAKES_PRIORITY,
+                                          RasterTilePriorityQueue::Type::ALL)
+                  .release());
   std::set<Tile*> expected_required_for_draw_tiles;
   std::set<Tile*> expected_required_for_activation_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
 
     if (!last_tile)
       last_tile = tile;
 
     EXPECT_LE(last_tile->priority(ACTIVE_TREE).priority_bin,
               tile->priority(ACTIVE_TREE).priority_bin);
     bool skip_updating_last_tile = false;
     if (last_tile->priority(ACTIVE_TREE).priority_bin ==
         tile->priority(ACTIVE_TREE).priority_bin) {
@@ skipping 17 matching lines @@
     }
 
     if (!skip_updating_last_tile)
       last_tile = tile;
     ++tile_count;
     smoothness_tiles.insert(tile);
     if (tile->required_for_draw())
       expected_required_for_draw_tiles.insert(tile);
     if (tile->required_for_activation())
       expected_required_for_activation_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(tile_count, smoothness_tiles.size());
   EXPECT_EQ(all_tiles, smoothness_tiles);
   // Since we don't guarantee increasing distance due to spiral iterator, we
   // should check that we're _mostly_ right.
   EXPECT_GT(correct_order_tiles, 3 * tile_count / 4);
 
   // Check that we have consistent required_for_activation tiles.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(
-      &queue, SMOOTHNESS_TAKES_PRIORITY,
-      RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION);
+  queue.reset(
+      host_impl_.BuildRasterQueue(
+                     SMOOTHNESS_TAKES_PRIORITY,
+                     RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION)
+          .release());
   required_for_activation_tiles.clear();
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_activation());
     required_for_activation_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(expected_required_for_activation_tiles,
             required_for_activation_tiles);
   EXPECT_NE(all_tiles, required_for_activation_tiles);
 
   // Check that we have consistent required_for_draw tiles.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, SMOOTHNESS_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW);
+  queue.reset(host_impl_.BuildRasterQueue(
+                             SMOOTHNESS_TAKES_PRIORITY,
+                             RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW)
+                  .release());
   required_for_draw_tiles.clear();
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_draw());
     required_for_draw_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(expected_required_for_draw_tiles, required_for_draw_tiles);
   EXPECT_NE(all_tiles, required_for_draw_tiles);
 
   std::set<Tile*> new_content_tiles;
   last_tile = NULL;
   size_t increasing_distance_tiles = 0u;
   // Here we expect to get increasing PENDING_TREE priority_bin.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, NEW_CONTENT_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::ALL);
+  queue.reset(host_impl_.BuildRasterQueue(NEW_CONTENT_TAKES_PRIORITY,
+                                          RasterTilePriorityQueue::Type::ALL)
+                  .release());
   tile_count = 0;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
 
     if (!last_tile)
       last_tile = tile;
 
     EXPECT_LE(last_tile->priority(PENDING_TREE).priority_bin,
               tile->priority(PENDING_TREE).priority_bin);
     if (last_tile->priority(PENDING_TREE).priority_bin ==
         tile->priority(PENDING_TREE).priority_bin) {
       increasing_distance_tiles +=
           last_tile->priority(PENDING_TREE).distance_to_visible <=
           tile->priority(PENDING_TREE).distance_to_visible;
     }
 
     if (tile->priority(PENDING_TREE).priority_bin == TilePriority::NOW &&
         last_tile->priority(PENDING_TREE).resolution !=
             tile->priority(PENDING_TREE).resolution) {
       // High resolution should come first.
       EXPECT_EQ(HIGH_RESOLUTION, last_tile->priority(PENDING_TREE).resolution);
     }
 
     last_tile = tile;
     new_content_tiles.insert(tile);
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(high_res_tiles, new_content_tiles);
   // Since we don't guarantee increasing distance due to spiral iterator, we
   // should check that we're _mostly_ right.
   EXPECT_GE(increasing_distance_tiles, 3 * tile_count / 4);
 
   // Check that we have consistent required_for_activation tiles.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(
-      &queue, NEW_CONTENT_TAKES_PRIORITY,
-      RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION);
+  queue.reset(
+      host_impl_.BuildRasterQueue(
+                     NEW_CONTENT_TAKES_PRIORITY,
+                     RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION)
+          .release());
   required_for_activation_tiles.clear();
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_activation());
     required_for_activation_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(expected_required_for_activation_tiles,
             required_for_activation_tiles);
   EXPECT_NE(new_content_tiles, required_for_activation_tiles);
 
   // Check that we have consistent required_for_draw tiles.
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, NEW_CONTENT_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW);
+  queue.reset(host_impl_.BuildRasterQueue(
+                             NEW_CONTENT_TAKES_PRIORITY,
+                             RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW)
+                  .release());
   required_for_draw_tiles.clear();
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile->required_for_draw());
     required_for_draw_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(expected_required_for_draw_tiles, required_for_draw_tiles);
   EXPECT_NE(new_content_tiles, required_for_draw_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueueInvalidation) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(gfx::Size(500, 500));
   SetupDefaultTrees(layer_bounds);
 
@@ skipping 45 matching lines @@
     for (int j = 0; j <= 3; ++j) {
       expected_all_tiles.insert(pending_layer_->HighResTiling()->TileAt(i, j));
       expected_all_tiles.insert(active_layer_->HighResTiling()->TileAt(i, j));
     }
   }
   // Expect 15 shared tiles and 1 unshared tile.
   EXPECT_EQ(17u, expected_all_tiles.size());
 
   // The actual test will now build different queues and verify that the queues
   // return the same information as computed manually above.
-  RasterTilePriorityQueue queue;
-  host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
+  scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
   std::set<Tile*> actual_now_tiles;
   std::set<Tile*> actual_all_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
-    queue.Pop();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
+    queue->Pop();
     if (tile->combined_priority().priority_bin == TilePriority::NOW)
       actual_now_tiles.insert(tile);
     actual_all_tiles.insert(tile);
   }
   EXPECT_EQ(expected_now_tiles, actual_now_tiles);
   EXPECT_EQ(expected_all_tiles, actual_all_tiles);
 
-  queue.Reset();
-  host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW);
+  queue.reset(host_impl_.BuildRasterQueue(
+                             SAME_PRIORITY_FOR_BOTH_TREES,
+                             RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW)
+                  .release());
   std::set<Tile*> actual_required_for_draw_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
-    queue.Pop();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
+    queue->Pop();
     actual_required_for_draw_tiles.insert(tile);
   }
   EXPECT_EQ(expected_required_for_draw_tiles, actual_required_for_draw_tiles);
 
-  queue.Reset();
-  host_impl_.BuildRasterQueue(
-      &queue, SAME_PRIORITY_FOR_BOTH_TREES,
-      RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION);
+  queue.reset(
+      host_impl_.BuildRasterQueue(
+                     SAME_PRIORITY_FOR_BOTH_TREES,
+                     RasterTilePriorityQueue::Type::REQUIRED_FOR_ACTIVATION)
+          .release());
   std::set<Tile*> actual_required_for_activation_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
-    queue.Pop();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
+    queue->Pop();
     actual_required_for_activation_tiles.insert(tile);
   }
   EXPECT_EQ(expected_required_for_activation_tiles,
             actual_required_for_activation_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, ActivationComesBeforeEventually) {
   base::TimeTicks time_ticks;
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(
@@ skipping 13 matching lines @@
   pending_child_raw->SetDrawsContent(true);
   pending_layer_->AddChild(pending_child.Pass());
 
   // Set a small viewport, so we have soon and eventually tiles.
   host_impl_.SetViewportSize(gfx::Size(200, 200));
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
   host_impl_.pending_tree()->UpdateDrawProperties();
 
-  RasterTilePriorityQueue queue;
   host_impl_.SetRequiresHighResToDraw();
-  host_impl_.BuildRasterQueue(&queue, SMOOTHNESS_TAKES_PRIORITY,
-                              RasterTilePriorityQueue::Type::ALL);
-  EXPECT_FALSE(queue.IsEmpty());
+  scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
+      SMOOTHNESS_TAKES_PRIORITY, RasterTilePriorityQueue::Type::ALL));
+  EXPECT_FALSE(queue->IsEmpty());
 
   // Get all the tiles that are NOW or SOON and make sure they are ready to
   // draw.
   std::vector<Tile*> all_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     if (tile->combined_priority().priority_bin >= TilePriority::EVENTUALLY)
       break;
 
     all_tiles.push_back(tile);
-    queue.Pop();
+    queue->Pop();
   }
 
   tile_manager()->InitializeTilesWithResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
   // Ensure we can activate.
   EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
   EXPECT_TRUE(pending_child_raw->AllTilesRequiredForActivationAreReadyToDraw());
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
   EvictionTilePriorityQueue empty_queue;
   host_impl_.BuildEvictionQueue(&empty_queue, SAME_PRIORITY_FOR_BOTH_TREES);
   EXPECT_TRUE(empty_queue.IsEmpty());
   std::set<Tile*> all_tiles;
   size_t tile_count = 0;
 
-  RasterTilePriorityQueue raster_queue;
-  host_impl_.BuildRasterQueue(&raster_queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  while (!raster_queue.IsEmpty()) {
+  scoped_ptr<RasterTilePriorityQueue> raster_queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
+  while (!raster_queue->IsEmpty()) {
     ++tile_count;
-    EXPECT_TRUE(raster_queue.Top());
-    all_tiles.insert(raster_queue.Top());
-    raster_queue.Pop();
+    EXPECT_TRUE(raster_queue->Top());
+    all_tiles.insert(raster_queue->Top());
+    raster_queue->Pop();
   }
 
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   tile_manager()->InitializeTilesWithResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
   EvictionTilePriorityQueue queue;
   host_impl_.BuildEvictionQueue(&queue, SMOOTHNESS_TAKES_PRIORITY);
@@ skipping 170 matching lines @@
       static_cast<FakePictureLayerImpl*>(pending_layer_->children()[0]);
   pending_child_layer->SetDrawsContent(true);
 
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
   host_impl_.pending_tree()->UpdateDrawProperties();
 
   std::set<Tile*> all_tiles;
   size_t tile_count = 0;
-  RasterTilePriorityQueue raster_queue;
-  host_impl_.BuildRasterQueue(&raster_queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  while (!raster_queue.IsEmpty()) {
+  scoped_ptr<RasterTilePriorityQueue> raster_queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
+  while (!raster_queue->IsEmpty()) {
     ++tile_count;
-    EXPECT_TRUE(raster_queue.Top());
-    all_tiles.insert(raster_queue.Top());
-    raster_queue.Pop();
+    EXPECT_TRUE(raster_queue->Top());
+    all_tiles.insert(raster_queue->Top());
+    raster_queue->Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(32u, tile_count);
 
   pending_layer_->ResetAllTilesPriorities();
 
   // Renew all of the tile priorities.
   gfx::Rect viewport(layer_bounds);
   pending_layer_->HighResTiling()->ComputeTilePriorityRects(viewport, 1.0f, 1.0,
                                                             Occlusion());
@@ skipping 178 matching lines @@
   }
   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(all_tiles, new_content_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueueEmptyLayers) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
-  RasterTilePriorityQueue queue;
-  host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  EXPECT_FALSE(queue.IsEmpty());
+  scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
+  EXPECT_FALSE(queue->IsEmpty());
 
   size_t tile_count = 0;
   std::set<Tile*> all_tiles;
-  while (!queue.IsEmpty()) {
-    EXPECT_TRUE(queue.Top());
-    all_tiles.insert(queue.Top());
+  while (!queue->IsEmpty()) {
+    EXPECT_TRUE(queue->Top());
+    all_tiles.insert(queue->Top());
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
-  queue.Reset();
   for (int i = 1; i < 10; ++i) {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::Create(host_impl_.pending_tree(), id_ + i);
     pending_layer->SetDrawsContent(true);
     pending_layer->set_has_valid_tile_priorities(true);
     pending_layer_->AddChild(pending_layer.Pass());
   }
 
-  host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  EXPECT_FALSE(queue.IsEmpty());
+  queue.reset(host_impl_.BuildRasterQueue(SAME_PRIORITY_FOR_BOTH_TREES,
+                                          RasterTilePriorityQueue::Type::ALL)
+                  .release());
+  EXPECT_FALSE(queue->IsEmpty());
 
   tile_count = 0;
   all_tiles.clear();
-  while (!queue.IsEmpty()) {
-    EXPECT_TRUE(queue.Top());
-    all_tiles.insert(queue.Top());
+  while (!queue->IsEmpty()) {
+    EXPECT_TRUE(queue->Top());
+    all_tiles.insert(queue->Top());
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueueEmptyLayers) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
-  RasterTilePriorityQueue raster_queue;
-  host_impl_.BuildRasterQueue(&raster_queue, SAME_PRIORITY_FOR_BOTH_TREES,
-                              RasterTilePriorityQueue::Type::ALL);
-  EXPECT_FALSE(raster_queue.IsEmpty());
+  scoped_ptr<RasterTilePriorityQueue> raster_queue(host_impl_.BuildRasterQueue(
+      SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
+  EXPECT_FALSE(raster_queue->IsEmpty());
 
   size_t tile_count = 0;
   std::set<Tile*> all_tiles;
-  while (!raster_queue.IsEmpty()) {
-    EXPECT_TRUE(raster_queue.Top());
-    all_tiles.insert(raster_queue.Top());
+  while (!raster_queue->IsEmpty()) {
+    EXPECT_TRUE(raster_queue->Top());
+    all_tiles.insert(raster_queue->Top());
     ++tile_count;
-    raster_queue.Pop();
+    raster_queue->Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   std::vector<Tile*> tiles(all_tiles.begin(), all_tiles.end());
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
 
   EvictionTilePriorityQueue queue;
   for (int i = 1; i < 10; ++i) {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
@@ skipping 200 matching lines @@
   EXPECT_GT(eventually_bin_order_correct_count,
             eventually_bin_order_incorrect_count);
 
   EXPECT_TRUE(have_tiles[TilePriority::NOW]);
   EXPECT_TRUE(have_tiles[TilePriority::SOON]);
   EXPECT_TRUE(have_tiles[TilePriority::EVENTUALLY]);
 }
 
 }  // namespace
 }  // namespace cc