cc: Added tile bundles

cc/test/fake_picture_layer_tiling_client.cc

Index: cc/test/fake_picture_layer_tiling_client.cc
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index e217336c1f2c25e88b9e2d5f00854fcea3b21ee2..c20236400ae0e7e25fc947fc55c878123c6ec5b5 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -23,19 +23,14 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl {
   virtual ~FakeInfinitePicturePileImpl() {}
 };
 
-FakePictureLayerTilingClient::FakePictureLayerTilingClient()
-    : tile_manager_(new FakeTileManager(&tile_manager_client_)),
-      pile_(new FakeInfinitePicturePileImpl()),
-      twin_tiling_(NULL),
-      allow_create_tile_(true) {}
-
 FakePictureLayerTilingClient::FakePictureLayerTilingClient(
-    ResourceProvider* resource_provider)
-    : tile_manager_(
-          new FakeTileManager(&tile_manager_client_, resource_provider)),
+    TileManager* tile_manager)
+    : tile_manager_(tile_manager),
       pile_(new FakeInfinitePicturePileImpl()),
       twin_tiling_(NULL),
-      allow_create_tile_(true) {}
+      allow_create_tile_(true),
+      is_active_(false),
+      is_pending_(false) {}
 
 FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
 }
@@ -45,10 +40,18 @@ scoped_refptr<Tile> FakePictureLayerTilingClient::CreateTile(
     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;
 }