Update from https://crrev.com/309415

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 935765bfd339abc0f2cd454b006056656ce57c57..e217a78487d59b18c609f8c9d56396678084d5a0 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -21,7 +21,7 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   ~FakePictureLayerTilingClient() override;
 
   // PictureLayerTilingClient implementation.
-  scoped_refptr<Tile> CreateTile(PictureLayerTiling* tiling,
+  scoped_refptr<Tile> CreateTile(float contents_scale,
                                  const gfx::Rect& rect) override;
   gfx::Size CalculateTileSize(const gfx::Size& content_bounds) const override;
   TilePriority::PriorityBin GetMaxTilePriorityBin() const override;
@@ -37,12 +37,18 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   bool RequiresHighResToDraw() const override;
   WhichTree GetTree() const override;
 
-  void set_twin_tiling(PictureLayerTiling* tiling) { twin_tiling_ = tiling; }
+  void set_twin_tiling_set(PictureLayerTilingSet* set) {
+    twin_set_ = set;
+    twin_tiling_ = nullptr;
+  }
+  void set_twin_tiling(PictureLayerTiling* tiling) {
+    twin_tiling_ = tiling;
+    twin_set_ = nullptr;
+  }
   void set_recycled_twin_tiling(PictureLayerTiling* tiling) {
     recycled_twin_tiling_ = tiling;
   }
   void set_text_rect(const gfx::Rect& rect) { text_rect_ = rect; }
-  void set_allow_create_tile(bool allow) { allow_create_tile_ = allow; }
   void set_invalidation(const Region& region) { invalidation_ = region; }
   void set_max_tile_priority_bin(TilePriority::PriorityBin bin) {
     max_tile_priority_bin_ = bin;
@@ -60,10 +66,10 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
   scoped_ptr<TileManager> tile_manager_;
   scoped_refptr<PicturePileImpl> pile_;
   gfx::Size tile_size_;
+  PictureLayerTilingSet* twin_set_;
   PictureLayerTiling* twin_tiling_;
   PictureLayerTiling* recycled_twin_tiling_;
   gfx::Rect text_rect_;
-  bool allow_create_tile_;
   Region invalidation_;
   TilePriority::PriorityBin max_tile_priority_bin_;
   WhichTree tree_;