cc: Switch tiling set eviction queue to consider combined priority.

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 47f49be5501b2841444fbca3df25ab9a175ca8d6..5369638c9808414b3deb27af4e892917e17cb3f1 100644
--- a/cc/layers/picture_layer_impl_perftest.cc
+++ b/cc/layers/picture_layer_impl_perftest.cc
@@ -121,22 +121,16 @@ class PictureLayerImplPerfTest : public testing::Test {
     bool update_lcd_text = false;
     host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
 
-    TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
-                                 SMOOTHNESS_TAKES_PRIORITY,
-                                 NEW_CONTENT_TAKES_PRIORITY};
-    int priority_count = 0;
     timer_.Reset();
     do {
       int count = num_tiles;
-      scoped_ptr<TilingSetEvictionQueue> queue(
-          new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set(),
-                                     priorities[priority_count], false));
+      scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue(
+          pending_layer_->picture_layer_tiling_set(), false));
       while (count--) {
         ASSERT_TRUE(!queue->IsEmpty()) << "count: " << count;
         ASSERT_TRUE(queue->Top() != nullptr) << "count: " << count;
         queue->Pop();
       }
-      priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
@@ -153,16 +147,10 @@ class PictureLayerImplPerfTest : public testing::Test {
     bool update_lcd_text = false;
     host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
 
-    TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
-                                 SMOOTHNESS_TAKES_PRIORITY,
-                                 NEW_CONTENT_TAKES_PRIORITY};
-    int priority_count = 0;
     timer_.Reset();
     do {
-      scoped_ptr<TilingSetEvictionQueue> queue(
-          new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set(),
-                                     priorities[priority_count], false));
-      priority_count = (priority_count + 1) % arraysize(priorities);
+      scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue(
+          pending_layer_->picture_layer_tiling_set(), false));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());