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

cc/test/fake_picture_layer_tiling_client.cc

Index: cc/test/fake_picture_layer_tiling_client.cc
===================================================================
--- cc/test/fake_picture_layer_tiling_client.cc	(revision 243316)
+++ cc/test/fake_picture_layer_tiling_client.cc	(working copy)
@@ -23,14 +23,19 @@
   virtual ~FakeInfinitePicturePileImpl() {}
 };
 
+FakePictureLayerTilingClient::FakePictureLayerTilingClient()
+    : tile_manager_(new FakeTileManager(&tile_manager_client_)),
+      pile_(new FakeInfinitePicturePileImpl()),
+      twin_tiling_(NULL),
+      allow_create_tile_(true) {}
+
 FakePictureLayerTilingClient::FakePictureLayerTilingClient(
-    TileManager* tile_manager)
-    : tile_manager_(tile_manager),
+    ResourceProvider* resource_provider)
+    : tile_manager_(
+          new FakeTileManager(&tile_manager_client_, resource_provider)),
       pile_(new FakeInfinitePicturePileImpl()),
       twin_tiling_(NULL),
-      allow_create_tile_(true),
-      is_active_(false),
-      is_pending_(false) {}
+      allow_create_tile_(true) {}
 
 FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
 }
@@ -40,18 +45,10 @@
     gfx::Rect rect) {
   if (!allow_create_tile_)
     return scoped_refptr<Tile>();
-  return tile_manager()->CreateTile(
+  return tile_manager_->CreateTile(
       pile_.get(), tile_size_, rect, gfx::Rect(), 1, 0, 0, Tile::USE_LCD_TEXT);
 }
 
-scoped_refptr<TileBundle> FakePictureLayerTilingClient::CreateTileBundle(
-    int offset_x,
-    int offset_y,
-    int width,
-    int height) {
-  return tile_manager()->CreateTileBundle(offset_x, offset_y, width, height);
-}
-
 void FakePictureLayerTilingClient::SetTileSize(gfx::Size tile_size) {
   tile_size_ = tile_size;
 }