cc: Added tile bundles

cc/test/fake_picture_layer_tiling_client.h

Index: cc/test/fake_picture_layer_tiling_client.h
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index 4b092e810f57b6ac46ed39eeaf390ed67a64d809..bd4f4435ac28e1684e0b8e144101576203490c72 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -16,13 +16,16 @@ namespace cc {
 
 class FakePictureLayerTilingClient : public PictureLayerTilingClient {
  public:
-  FakePictureLayerTilingClient();
-  explicit FakePictureLayerTilingClient(ResourceProvider* resource_provider);
+  explicit FakePictureLayerTilingClient(TileManager* tile_manager);
   virtual ~FakePictureLayerTilingClient();
 
   // PictureLayerTilingClient implementation.
   virtual scoped_refptr<Tile> CreateTile(
       PictureLayerTiling* tiling, gfx::Rect rect) OVERRIDE;
+  virtual scoped_refptr<TileBundle> CreateTileBundle(int offset_x,
+                                                     int offset_y,
+                                                     int width,
+                                                     int height) OVERRIDE;
   virtual void UpdatePile(Tile* tile) OVERRIDE {}
   virtual gfx::Size CalculateTileSize(
       gfx::Size content_bounds) const OVERRIDE;
@@ -42,18 +45,19 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   void set_invalidation(const Region& region) { invalidation_ = region; }
 
   TileManager* tile_manager() const {
-    return tile_manager_.get();
+    return tile_manager_;
   }
 
  protected:
-  FakeTileManagerClient tile_manager_client_;
-  scoped_ptr<TileManager> tile_manager_;
+  TileManager* tile_manager_;
   scoped_refptr<PicturePileImpl> pile_;
   gfx::Size tile_size_;
   PictureLayerTiling* twin_tiling_;
   gfx::Rect text_rect_;
   bool allow_create_tile_;
   Region invalidation_;
+  bool is_active_;
+  bool is_pending_;
 };
 
 }  // namespace cc