Update from https://crrev.com/315085

cc/trees/layer_tree_host_pixeltest_on_demand_raster.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 "cc/layers/append_quads_data.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/test/layer_tree_pixel_test.h"
@@ skipping 43 matching lines @@
   void RunOnDemandRasterPixelTest();
 };
 
 class BlueYellowLayerClient : public ContentLayerClient {
  public:
   explicit BlueYellowLayerClient(gfx::Rect layer_rect)
       : layer_rect_(layer_rect) {}
 
   bool FillsBoundsCompletely() const override { return false; }
 
-  void PaintContents(
-      SkCanvas* canvas,
-      const gfx::Rect& clip,
-      ContentLayerClient::GraphicsContextStatus gc_status) override {
+  void PaintContents(SkCanvas* canvas,
+                     const gfx::Rect& clip,
+                     PaintingControlSetting picture_control) override {
     SkPaint paint;
     paint.setColor(SK_ColorBLUE);
     canvas->drawRect(SkRect::MakeWH(layer_rect_.width(),
                                     layer_rect_.height() / 2),
                      paint);
 
     paint.setColor(SK_ColorYELLOW);
     canvas->drawRect(
         SkRect::MakeXYWH(0,
                          layer_rect_.height() / 2,
                          layer_rect_.width(),
                          layer_rect_.height() / 2),
         paint);
   }
 
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       const gfx::Rect& clip,
-      GraphicsContextStatus gc_status) override {
+      PaintingControlSetting picture_control) override {
     NOTIMPLEMENTED();
     return DisplayItemList::Create();
   }
 
  private:
   gfx::Rect layer_rect_;
 };
 
 void LayerTreeHostOnDemandRasterPixelTest::RunOnDemandRasterPixelTest() {
   // Use multiple colors in a single layer to prevent bypassing on-demand
@@ skipping 12 matching lines @@
 }
 
 TEST_F(LayerTreeHostOnDemandRasterPixelTest, RasterPictureLayer) {
   RunOnDemandRasterPixelTest();
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID