Rename paint data structures

ui/views/controls/scrollbar/cocoa_scroll_bar.mm

Index: ui/views/controls/scrollbar/cocoa_scroll_bar.mm
diff --git a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
index e3803b6ac4595bbc2ead69c6341f4232b770891f..bc3c30f233d71a72f95cb0194edd6d74c697a185 100644
--- a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
+++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
@@ -122,9 +122,9 @@ void CocoaScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
   }
 
   gfx::Rect local_bounds(GetLocalBounds());
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setColor(thumb_color);
   const SkScalar radius =
       std::min(local_bounds.width(), local_bounds.height());
@@ -256,14 +256,14 @@ void CocoaScrollBar::OnPaint(gfx::Canvas* canvas) {
     gradient_bounds[0].set(track_rect.x(), track_rect.y());
     gradient_bounds[1].set(track_rect.right(), track_rect.y());
   }
-  SkPaint gradient;
-  gradient.setShader(SkGradientShader::MakeLinear(
+  cc::PaintFlags gradient;
+  gradient.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
       gradient_bounds, kScrollerTrackGradientColors, nullptr,
-      arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode));
+      arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode)));
   canvas->DrawRect(track_rect, gradient);
 
   // Draw the inner border: top if horizontal, left if vertical.
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setColor(kScrollerTrackInnerBorderColor);
   gfx::Rect inner_border(track_rect);
   if (IsHorizontal())