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

cc/resources/picture_pile_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <utility>
 
 #include "cc/resources/picture_pile.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_picture_pile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace cc {
 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));
     pile_.SetMinContentsScale(min_scale_);
     client_ = FakeContentLayerClient();
     SetTilingSize(pile_.tiling().max_texture_size());
   }
 
   void SetTilingSize(const gfx::Size& tiling_size) {
     Region invalidation;
     gfx::Rect viewport_rect(tiling_size);
     UpdateAndExpandInvalidation(&invalidation, tiling_size, viewport_rect);
   }
 
   gfx::Size tiling_size() const { return pile_.GetSize(); }
   gfx::Rect tiling_rect() const { return gfx::Rect(pile_.GetSize()); }
 
   bool UpdateAndExpandInvalidation(Region* invalidation,
                                    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() {
     Region invalidation = tiling_rect();
     bool result = UpdateAndExpandInvalidation(&invalidation, tiling_size(),
                                               tiling_rect());
     EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
     return result;
   }
 
   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) {
   // Don't expand the interest rect past what we invalidate.
   pile_.SetPixelRecordDistance(0);
 
   gfx::Size tile_size(100, 100);
   pile_.tiling().SetMaxTextureSize(tile_size);
 
   gfx::Size pile_size(400, 400);
@@ skipping 443 matching lines @@
 enum Corner {
   TOP_LEFT,
   TOP_RIGHT,
   BOTTOM_LEFT,
   BOTTOM_RIGHT,
 };
 
 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) {
       case TOP_LEFT:
         return gfx::Rect(0, 0, 1, 1);
       case TOP_RIGHT:
         return gfx::Rect(s.width() - 1, 0, 1, 1);
       case BOTTOM_LEFT:
         return gfx::Rect(0, s.height() - 1, 1, 1);
       case BOTTOM_RIGHT:
@@ skipping 997 matching lines @@
   EXPECT_TRUE(pile_.HasRecordings());
   pile_.SetEmptyBounds();
   EXPECT_FALSE(pile_.is_solid_color());
   EXPECT_TRUE(pile_.GetSize().IsEmpty());
   EXPECT_TRUE(pile_.picture_map().empty());
   EXPECT_FALSE(pile_.HasRecordings());
 }
 
 }  // namespace
 }  // namespace cc