Update from https://crrev.com/315085

cc/test/fake_content_layer_client.cc

 // Copyright 2012 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/test/fake_content_layer_client.h"
 
 #include "cc/resources/clip_display_item.h"
 #include "cc/resources/drawing_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 FakeContentLayerClient::FakeContentLayerClient()
     : fill_with_nonsolid_color_(false), last_canvas_(NULL) {
 }
 
 FakeContentLayerClient::~FakeContentLayerClient() {
 }
 
 void FakeContentLayerClient::PaintContents(
     SkCanvas* canvas,
     const gfx::Rect& paint_rect,
-    ContentLayerClient::GraphicsContextStatus gc_status) {
+    PaintingControlSetting painting_control) {
   last_canvas_ = canvas;
-  last_context_status_ = gc_status;
+  last_painting_control_ = painting_control;
 
   canvas->clipRect(gfx::RectToSkRect(paint_rect));
   for (RectPaintVector::const_iterator it = draw_rects_.begin();
       it != draw_rects_.end(); ++it) {
     const gfx::RectF& draw_rect = it->first;
     const SkPaint& paint = it->second;
     canvas->drawRectCoords(draw_rect.x(),
                            draw_rect.y(),
                            draw_rect.right(),
                            draw_rect.bottom(),
@@ skipping 13 matching lines @@
       paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
       canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
       draw_rect.Inset(1, 1);
     }
   }
 }
 
 scoped_refptr<DisplayItemList>
 FakeContentLayerClient::PaintContentsToDisplayList(
     const gfx::Rect& clip,
-    GraphicsContextStatus gc_status) {
+    PaintingControlSetting painting_control) {
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   skia::RefPtr<SkPicture> picture;
   scoped_refptr<DisplayItemList> list = DisplayItemList::Create();
   list->AppendItem(ClipDisplayItem::Create(clip, std::vector<SkRRect>()));
 
   for (RectPaintVector::const_iterator it = draw_rects_.begin();
        it != draw_rects_.end(); ++it) {
     const gfx::RectF& draw_rect = it->first;
     const SkPaint& paint = it->second;
@@ skipping 31 matching lines @@
     }
   }
 
   list->AppendItem(EndClipDisplayItem::Create());
   return list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 }  // namespace cc