cc: Make eviction queue building consistent with raster.

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 5818 matching lines @@
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     EXPECT_EQ(4u, host_impl->resource_provider()->num_resources());
 
     // Verify which tiles got resources using an eviction iterator, which has to
     // return all tiles that have resources.
-    EvictionTilePriorityQueue eviction_queue;
-    host_impl->BuildEvictionQueue(&eviction_queue,
-                                  SAME_PRIORITY_FOR_BOTH_TREES);
+    scoped_ptr<EvictionTilePriorityQueue> eviction_queue(
+        host_impl->BuildEvictionQueue(SAME_PRIORITY_FOR_BOTH_TREES));
     int tile_count = 0;
-    for (; !eviction_queue.IsEmpty(); eviction_queue.Pop()) {
-      Tile* tile = eviction_queue.Top();
+    for (; !eviction_queue->IsEmpty(); eviction_queue->Pop()) {
+      Tile* tile = eviction_queue->Top();
       // Ensure this tile is within the viewport.
       EXPECT_TRUE(tile->content_rect().Intersects(gfx::Rect(viewport_size_)));
       // Ensure that the tile is 1/4 of the viewport tall (plus padding).
       EXPECT_EQ(tile->content_rect().height(),
                 (viewport_size_.height() / 4) + 2);
       ++tile_count;
     }
     EXPECT_EQ(4, tile_count);
     EndTest();
     return draw_result;
@@ skipping 316 matching lines @@
 
   void AfterTest() override { EXPECT_TRUE(did_commit_); }
 
  private:
   bool did_commit_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit);
 
 }  // namespace cc