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

cc/test/fake_tile_manager.cc

Index: cc/test/fake_tile_manager.cc
===================================================================
--- cc/test/fake_tile_manager.cc	(revision 243316)
+++ cc/test/fake_tile_manager.cc	(working copy)
@@ -55,8 +55,7 @@
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   1,
                   std::numeric_limits<unsigned>::max(),
-                  NULL),
-      in_bundle_cleanup_(false) {}
+                  NULL) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider)
@@ -65,8 +64,7 @@
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   1,
                   std::numeric_limits<unsigned>::max(),
-                  NULL),
-      in_bundle_cleanup_(false) {}
+                  NULL) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider,
@@ -76,8 +74,7 @@
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   1,
                   raster_task_limit_bytes,
-                  NULL),
-      in_bundle_cleanup_(false) {}
+                  NULL) {}
 
 FakeTileManager::~FakeTileManager() {}
 
@@ -103,15 +100,7 @@
 
 void FakeTileManager::Release(Tile* tile) {
   TileManager::Release(tile);
-  if (!in_bundle_cleanup_)
-    CleanUpReleasedTiles();
-}
-
-void FakeTileManager::Release(TileBundle* bundle) {
-  TileManager::Release(bundle);
-  in_bundle_cleanup_ = true;
   CleanUpReleasedTiles();
-  in_bundle_cleanup_ = false;
 }
 
 }  // namespace cc