Update from https://crrev.com/311145

cc/layers/picture_layer_impl_perftest.cc

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 94f8317fd1298adbb805bb4717c38644e641a68f..c1c0dbbf889f6689d187a2b48a9dfd2ecccd5fdb 100644
--- a/cc/layers/picture_layer_impl_perftest.cc
+++ b/cc/layers/picture_layer_impl_perftest.cc
@@ -5,6 +5,7 @@
 #include "cc/layers/picture_layer_impl.h"
 
 #include "cc/debug/lap_timer.h"
+#include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
@@ -76,8 +77,8 @@ class PictureLayerImplPerfTest : public testing::Test {
     timer_.Reset();
     do {
       int count = num_tiles;
-      scoped_ptr<TilingSetRasterQueue> queue =
-          pending_layer_->CreateRasterQueue(false);
+      scoped_ptr<TilingSetRasterQueue> queue(new TilingSetRasterQueueAll(
+          pending_layer_->picture_layer_tiling_set(), false));
       while (count--) {
         ASSERT_TRUE(!queue->IsEmpty()) << "count: " << count;
         ASSERT_TRUE(queue->Top() != nullptr) << "count: " << count;
@@ -99,8 +100,8 @@ class PictureLayerImplPerfTest : public testing::Test {
 
     timer_.Reset();
     do {
-      scoped_ptr<TilingSetRasterQueue> queue =
-          pending_layer_->CreateRasterQueue(false);
+      scoped_ptr<TilingSetRasterQueue> queue(new TilingSetRasterQueueAll(
+          pending_layer_->picture_layer_tiling_set(), false));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
@@ -122,8 +123,9 @@ class PictureLayerImplPerfTest : public testing::Test {
     timer_.Reset();
     do {
       int count = num_tiles;
-      scoped_ptr<TilingSetEvictionQueue> queue =
-          pending_layer_->CreateEvictionQueue(priorities[priority_count]);
+      scoped_ptr<TilingSetEvictionQueue> queue(
+          new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set(),
+                                     priorities[priority_count], false));
       while (count--) {
         ASSERT_TRUE(!queue->IsEmpty()) << "count: " << count;
         ASSERT_TRUE(queue->Top() != nullptr) << "count: " << count;
@@ -151,8 +153,9 @@ class PictureLayerImplPerfTest : public testing::Test {
     int priority_count = 0;
     timer_.Reset();
     do {
-      scoped_ptr<TilingSetEvictionQueue> queue =
-          pending_layer_->CreateEvictionQueue(priorities[priority_count]);
+      scoped_ptr<TilingSetEvictionQueue> queue(
+          new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set(),
+                                     priorities[priority_count], false));
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());