| 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 597e0d8d32d9f54e98aa945b8e4ed0dea40ce31b..a6ad30cb55fb0c0b7f0db9a98bb44e6c731c4d76 100644
 | 
| --- a/cc/test/fake_picture_layer_tiling_client.cc
 | 
| +++ b/cc/test/fake_picture_layer_tiling_client.cc
 | 
| @@ -25,17 +25,23 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl {
 | 
|  
 | 
|  FakePictureLayerTilingClient::FakePictureLayerTilingClient()
 | 
|      : tile_manager_(new FakeTileManager(&tile_manager_client_)),
 | 
| +      set_tile_manager_(NULL),
 | 
|        pile_(new FakeInfinitePicturePileImpl()),
 | 
|        twin_tiling_(NULL),
 | 
| -      allow_create_tile_(true) {}
 | 
| +      allow_create_tile_(true),
 | 
| +      is_active_(false),
 | 
| +      is_pending_(false) {}
 | 
|  
 | 
|  FakePictureLayerTilingClient::FakePictureLayerTilingClient(
 | 
|      ResourceProvider* resource_provider)
 | 
|      : tile_manager_(
 | 
|            new FakeTileManager(&tile_manager_client_, resource_provider)),
 | 
| +      set_tile_manager_(NULL),
 | 
|        pile_(new FakeInfinitePicturePileImpl()),
 | 
|        twin_tiling_(NULL),
 | 
| -      allow_create_tile_(true) {}
 | 
| +      allow_create_tile_(true),
 | 
| +      is_active_(false),
 | 
| +      is_pending_(false) {}
 | 
|  
 | 
|  FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
 | 
|  }
 | 
| @@ -45,10 +51,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, true);
 | 
|  }
 | 
|  
 | 
| +scoped_refptr<TileBundle> FakePictureLayerTilingClient::CreateTileBundle(
 | 
| +    int width,
 | 
| +    int height,
 | 
| +    int offset_x,
 | 
| +    int offset_y) {
 | 
| +  return tile_manager()->CreateTileBundle(width, height, offset_x, offset_y);
 | 
| +}
 | 
| +
 | 
|  void FakePictureLayerTilingClient::SetTileSize(gfx::Size tile_size) {
 | 
|    tile_size_ = tile_size;
 | 
|  }
 | 
| 
 |