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

cc/resources/picture_pile_unittest.cc

Index: cc/resources/picture_pile_unittest.cc
diff --git a/cc/resources/picture_pile_unittest.cc b/cc/resources/picture_pile_unittest.cc
index 25e0d128510f2cfef273dc992d5ebfad3a39a0ae..0a9a90765805349f0f200ab61f435593504bfb60 100644
--- a/cc/resources/picture_pile_unittest.cc
+++ b/cc/resources/picture_pile_unittest.cc
@@ -17,11 +17,7 @@ namespace {
 
 class PicturePileTestBase {
  public:
-  PicturePileTestBase()
-      : background_color_(SK_ColorBLUE),
-        min_scale_(0.125),
-        frame_number_(0),
-        contents_opaque_(false) {}
+  PicturePileTestBase() : min_scale_(0.125), frame_number_(0) {}
 
   void InitializeData() {
     pile_.SetTileGridSize(gfx::Size(1000, 1000));
@@ -43,10 +39,9 @@ class PicturePileTestBase {
                                    const gfx::Size& layer_size,
                                    const gfx::Rect& visible_layer_rect) {
     frame_number_++;
-    return pile_.UpdateAndExpandInvalidation(
-        &client_, invalidation, background_color_, contents_opaque_, false,
-        layer_size, visible_layer_rect, frame_number_,
-        Picture::RECORD_NORMALLY);
+    return pile_.UpdateAndExpandInvalidation(&client_, invalidation, layer_size,
+                                             visible_layer_rect, frame_number_,
+                                             Picture::RECORD_NORMALLY);
   }
 
   bool UpdateWholePile() {
@@ -59,15 +54,13 @@ class PicturePileTestBase {
 
   FakeContentLayerClient client_;
   FakePicturePile pile_;
-  SkColor background_color_;
   float min_scale_;
   int frame_number_;
-  bool contents_opaque_;
 };
 
 class PicturePileTest : public PicturePileTestBase, public testing::Test {
  public:
-  virtual void SetUp() override { InitializeData(); }
+  void SetUp() override { InitializeData(); }
 };
 
 TEST_F(PicturePileTest, InvalidationOnTileBorderOutsideInterestRect) {
@@ -531,7 +524,7 @@ enum Corner {
 class PicturePileResizeCornerTest : public PicturePileTestBase,
                                     public testing::TestWithParam<Corner> {
  protected:
-  virtual void SetUp() override { InitializeData(); }
+  void SetUp() override { InitializeData(); }
 
   static gfx::Rect CornerSinglePixelRect(Corner corner, const gfx::Size& s) {
     switch (corner) {