cc: Rework how picture layer tiling set gets into raster queues.

cc/resources/tile_manager_perftest.cc

Index: cc/resources/tile_manager_perftest.cc
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
index bb4ce7c42106848746182097b2c45b2b4ac9f66e..930ff349cc42b4c8ea8a81c9d339cb17c54d7980 100644
--- a/cc/resources/tile_manager_perftest.cc
+++ b/cc/resources/tile_manager_perftest.cc
@@ -183,8 +183,11 @@ class TileManagerPerfTest : public testing::Test {
 
     timer_.Reset();
     do {
-      scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
-          priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
+      scoped_ptr<RasterTilePriorityQueue> queue(
+          host_impl_.tile_manager()->BuildRasterQueue(
+              RasterTilePriorityQueue::Type::ALL));
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
@@ -213,8 +216,11 @@ class TileManagerPerfTest : public testing::Test {
     timer_.Reset();
     do {
       int count = tile_count;
-      scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
-          priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
+      scoped_ptr<RasterTilePriorityQueue> queue(
+          host_impl_.tile_manager()->BuildRasterQueue(
+              RasterTilePriorityQueue::Type::ALL));
       while (count--) {
         ASSERT_FALSE(queue->IsEmpty());
         ASSERT_TRUE(queue->Top() != NULL);
@@ -252,8 +258,10 @@ class TileManagerPerfTest : public testing::Test {
 
     timer_.Reset();
     do {
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
       scoped_ptr<EvictionTilePriorityQueue> queue(
-          host_impl_.BuildEvictionQueue(priorities[priority_count]));
+          host_impl_.tile_manager()->BuildEvictionQueue());
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
@@ -288,8 +296,10 @@ class TileManagerPerfTest : public testing::Test {
     timer_.Reset();
     do {
       int count = tile_count;
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
       scoped_ptr<EvictionTilePriorityQueue> queue(
-          host_impl_.BuildEvictionQueue(priorities[priority_count]));
+          host_impl_.tile_manager()->BuildEvictionQueue());
       while (count--) {
         ASSERT_FALSE(queue->IsEmpty());
         ASSERT_TRUE(queue->Top() != NULL);