cc: Switch eviction iterators to consider combined priority.

cc/layers/picture_layer_impl_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/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <utility>
@@ skipping 3951 matching lines @@
                 EXPECT_LT(priority_for_tree_priority.priority_bin,
                           priority.priority_bin);
                 EXPECT_EQ(priority_for_tree_priority.priority_bin,
                           twin_priority.priority_bin);
                 EXPECT_TRUE(priority_for_tree_priority.priority_bin <
                             priority.priority_bin);
               } else if (tile->is_occluded(tree) !=
                          tile->is_occluded(twin_tree)) {
                 EXPECT_TRUE(tile->is_occluded(tree));
                 EXPECT_FALSE(tile->is_occluded(twin_tree));
-                EXPECT_FALSE(
-                    tile->is_occluded_for_tree_priority(tree_priority));
+                EXPECT_FALSE(tile->is_occluded_combined());
               } else if (priority.distance_to_visible !=
                          twin_priority.distance_to_visible) {
                 EXPECT_LT(priority_for_tree_priority.distance_to_visible,
                           priority.distance_to_visible);
                 EXPECT_EQ(priority_for_tree_priority.distance_to_visible,
                           twin_priority.distance_to_visible);
                 EXPECT_TRUE(priority_for_tree_priority.distance_to_visible <
                             priority.distance_to_visible);
               } else {
                 // Shared tiles having the same active and pending priorities
@@ skipping 950 matching lines @@
   result = layer->CalculateTileSize(gfx::Size(447, 400));
   EXPECT_EQ(result.width(), 448);
   EXPECT_EQ(result.height(), 448);
   result = layer->CalculateTileSize(gfx::Size(500, 499));
   EXPECT_EQ(result.width(), 512);
   EXPECT_EQ(result.height(), 500 + 2);
 }
 
 }  // namespace
 }  // namespace cc