cc: Added tile bundles

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 2c09c63a8ce6e23508d018698e0a3bcc1a3ba935..8cc4dc33bfdbfaa113f60e6b0bf3eb5a175e69ce 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -88,11 +88,16 @@ class PictureLayerImplTest : public testing::Test {
     active_layer_->AddTiling(2.3f);
     active_layer_->AddTiling(1.0f);
     active_layer_->AddTiling(0.5f);
-    for (size_t i = 0; i < active_layer_->tilings()->num_tilings(); ++i)
-      active_layer_->tilings()->tiling_at(i)->CreateAllTilesForTesting();
+    for (size_t i = 0; i < active_layer_->tilings()->num_tilings(); ++i) {
+      active_layer_->tilings()->tiling_at(i)->CreateTilesForTesting(
+          ACTIVE_TREE);
+    }
     pending_layer_->set_invalidation(invalidation);
-    for (size_t i = 0; i < pending_layer_->tilings()->num_tilings(); ++i)
-      pending_layer_->tilings()->tiling_at(i)->CreateAllTilesForTesting();
+    for (size_t i = 0; i < pending_layer_->tilings()->num_tilings(); ++i) {
+      pending_layer_->tilings()
+          ->tiling_at(i)
+          ->CreateTilesForTesting(PENDING_TREE);
+    }
   }
 
   void SetupPendingTree(
@@ -1188,7 +1193,6 @@ TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {
        ++iter) {
     if (!*iter)
       continue;
-    Tile* tile = *iter;
     TilePriority priority;
     priority.resolution = HIGH_RESOLUTION;
     if (++tile_count % 2) {
@@ -1198,7 +1202,7 @@ TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {
       priority.time_to_visible_in_seconds = 1.f;
       priority.distance_to_visible_in_pixels = 1.f;
     }
-    tile->SetPriority(PENDING_TREE, priority);
+    iter.SetPriorityForTesting(priority);
   }
 
   pending_layer_->MarkVisibleResourcesAsRequired();
@@ -1215,7 +1219,7 @@ TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {
     if (!*iter)
       continue;
     const Tile* tile = *iter;
-    if (tile->priority(PENDING_TREE).distance_to_visible_in_pixels == 0.f) {
+    if (iter.priority().distance_to_visible_in_pixels == 0.f) {
       EXPECT_TRUE(tile->required_for_activation());
       num_visible++;
     } else {