Update from https://crrev.com/315085

cc/test/solid_color_content_layer_client.cc

Index: cc/test/solid_color_content_layer_client.cc
diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc
index 701f004ffd3f34e1a5cbf3b8f1ccda8fcda27148..7e97bb8ae92d21da0ac0f387df41247bac191885 100644
--- a/cc/test/solid_color_content_layer_client.cc
+++ b/cc/test/solid_color_content_layer_client.cc
@@ -14,7 +14,7 @@ namespace cc {
 void SolidColorContentLayerClient::PaintContents(
     SkCanvas* canvas,
     const gfx::Rect& rect,
-    ContentLayerClient::GraphicsContextStatus gc_status) {
+    PaintingControlSetting painting_control) {
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(color_);
@@ -28,7 +28,7 @@ void SolidColorContentLayerClient::PaintContents(
 scoped_refptr<DisplayItemList>
 SolidColorContentLayerClient::PaintContentsToDisplayList(
     const gfx::Rect& clip,
-    GraphicsContextStatus gc_status) {
+    PaintingControlSetting painting_control) {
   NOTIMPLEMENTED();
   return DisplayItemList::Create();
 }