Update from chromium https://crrev.com/304586

cc/test/fake_picture_pile_impl.h

Index: cc/test/fake_picture_pile_impl.h
diff --git a/cc/test/fake_picture_pile_impl.h b/cc/test/fake_picture_pile_impl.h
index f1a9d31ad3da684c651b42ed7484c39dae8ef2a8..5769d3713b0c609015c71a2c9f028ef69c0f6a78 100644
--- a/cc/test/fake_picture_pile_impl.h
+++ b/cc/test/fake_picture_pile_impl.h
@@ -9,6 +9,10 @@
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/test/fake_content_layer_client.h"
 
+namespace base {
+class WaitableEvent;
+}
+
 namespace cc {
 
 class FakePicturePileImpl : public PicturePileImpl {
@@ -23,6 +27,14 @@ class FakePicturePileImpl : public PicturePileImpl {
       CreateEmptyPileThatThinksItHasRecordings(const gfx::Size& tile_size,
                                                const gfx::Size& layer_bounds);
   static scoped_refptr<FakePicturePileImpl> CreateInfiniteFilledPile();
+  static scoped_refptr<FakePicturePileImpl> CreateFromPile(
+      const PicturePile* other,
+      base::WaitableEvent* playback_allowed_event);
+
+  // Hi-jack the PlaybackToCanvas method to delay its completion.
+  void PlaybackToCanvas(SkCanvas* canvas,
+                        const gfx::Rect& canvas_rect,
+                        float contents_scale) const override;
 
   TilingData& tiling() { return tiling_; }
 
@@ -56,14 +68,6 @@ class FakePicturePileImpl : public PicturePileImpl {
     background_color_ = color;
   }
 
-  void set_contents_opaque(bool contents_opaque) {
-    contents_opaque_ = contents_opaque;
-  }
-
-  void set_contents_fill_bounds_completely(bool fills) {
-    contents_fill_bounds_completely_ = fills;
-  }
-
   void set_clear_canvas_with_debug_color(bool clear) {
     clear_canvas_with_debug_color_ = clear;
   }
@@ -73,7 +77,6 @@ class FakePicturePileImpl : public PicturePileImpl {
   }
 
   bool HasRecordingAt(int x, int y) const;
-  void SetIsMask(bool mask) { is_mask_ = mask; }
 
   int num_tiles_x() const { return tiling_.num_tiles_x(); }
   int num_tiles_y() const { return tiling_.num_tiles_y(); }
@@ -84,11 +87,13 @@ class FakePicturePileImpl : public PicturePileImpl {
 
  protected:
   FakePicturePileImpl();
-  explicit FakePicturePileImpl(const PicturePile* other);
+  FakePicturePileImpl(const PicturePile* other,
+                      base::WaitableEvent* playback_allowed_event);
   ~FakePicturePileImpl() override;
 
   FakeContentLayerClient client_;
   SkPaint default_paint_;
+  base::WaitableEvent* playback_allowed_event_;
   SkTileGridFactory::TileGridInfo tile_grid_info_;
 };