Rename paint data structures

cc/trees/layer_tree_host_pixeltest_scrollbars.cc

 // Copyright 2016 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 <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/painted_scrollbar_layer.h"
 #include "cc/layers/solid_color_layer.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/test_in_process_context_provider.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
 #if !defined(OS_ANDROID)
 
 namespace cc {
 namespace {
 
 class LayerTreeHostScrollbarsPixelTest : public LayerTreePixelTest {
@@ skipping 19 matching lines @@
   ScrollbarOrientation Orientation() const override { return VERTICAL; }
   bool IsLeftSideVerticalScrollbar() const override { return false; }
   gfx::Point Location() const override { return gfx::Point(); }
   bool IsOverlay() const override { return false; }
   bool HasThumb() const override { return thumb_; }
   int ThumbThickness() const override { return rect_.width(); }
   int ThumbLength() const override { return rect_.height(); }
   gfx::Rect TrackRect() const override { return rect_; }
   float ThumbOpacity() const override { return 1.f; }
   bool NeedsPaintPart(ScrollbarPart part) const override { return true; }
-  void PaintPart(SkCanvas* canvas,
+  void PaintPart(PaintCanvas* canvas,
                  ScrollbarPart part,
                  const gfx::Rect& content_rect) override {
-    SkPaint paint;
-    paint.setStyle(SkPaint::kStroke_Style);
+    PaintFlags paint;
+    paint.setStyle(PaintFlags::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(paint_scale_));
     paint.setColor(color_);
 
     gfx::Rect inset_rect = content_rect;
     while (!inset_rect.IsEmpty()) {
       int big = paint_scale_ + 2;
       int small = paint_scale_;
       inset_rect.Inset(big, big, small, small);
       canvas->drawRect(RectToSkRect(inset_rect), paint);
       inset_rect.Inset(big, big, small, small);
@@ skipping 97 matching lines @@
   layer->SetTransform(scale_transform);
 
   RunPixelTest(PIXEL_TEST_GL, background,
                base::FilePath(FILE_PATH_LITERAL("spiral_64_scale.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID