Merge 241994 "Revert "cc: Added tile bundles""

cc/test/fake_picture_layer_impl.cc

Index: cc/test/fake_picture_layer_impl.cc
===================================================================
--- cc/test/fake_picture_layer_impl.cc	(revision 243316)
+++ cc/test/fake_picture_layer_impl.cc	(working copy)
@@ -77,14 +77,14 @@
   for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
        ++tiling_idx) {
     PictureLayerTiling* tiling = tilings_->tiling_at(tiling_idx);
-    std::vector<TileBundle*> bundles = tiling->AllTileBundlesForTesting();
-    for (size_t bundle_idx = 0; bundle_idx < bundles.size(); ++bundle_idx) {
-      TileBundle* bundle = bundles[bundle_idx];
+    std::vector<Tile*> tiles = tiling->AllTilesForTesting();
+    for (size_t tile_idx = 0; tile_idx < tiles.size(); ++tile_idx) {
+      Tile* tile = tiles[tile_idx];
       TilePriority priority;
       priority.resolution = HIGH_RESOLUTION;
       priority.time_to_visible_in_seconds = 0.f;
       priority.distance_to_visible_in_pixels = 0.f;
-      bundle->SetPriority(tree, priority);
+      tile->SetPriority(tree, priority);
     }
   }
 }
@@ -109,22 +109,15 @@
   }
 }
 
-void FakePictureLayerImpl::CreateDefaultTilingsAndTiles(WhichTree tree) {
+void FakePictureLayerImpl::CreateDefaultTilingsAndTiles() {
   layer_tree_impl()->UpdateDrawProperties();
 
   if (CanHaveTilings()) {
     DCHECK_EQ(tilings()->num_tilings(), 2u);
     DCHECK_EQ(tilings()->tiling_at(0)->resolution(), HIGH_RESOLUTION);
     DCHECK_EQ(tilings()->tiling_at(1)->resolution(), LOW_RESOLUTION);
-    if (tree == ACTIVE_TREE) {
-      DCHECK(layer_tree_impl()->IsActiveTree());
-      HighResTiling()->CreateTilesForTesting(ACTIVE_TREE);
-      LowResTiling()->CreateTilesForTesting(ACTIVE_TREE);
-    } else {
-      DCHECK(layer_tree_impl()->IsPendingTree());
-      HighResTiling()->CreateTilesForTesting(PENDING_TREE);
-      LowResTiling()->CreateTilesForTesting(PENDING_TREE);
-    }
+    HighResTiling()->CreateAllTilesForTesting();
+    LowResTiling()->CreateAllTilesForTesting();
   } else {
     DCHECK_EQ(tilings()->num_tilings(), 0u);
   }