ui: Clean up naming of paint-related identifiers

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 bc3c30f233d71a72f95cb0194edd6d74c697a185..c77bdf4b525e490ce7d09c1e22a4abafb80bbe75 100644
--- a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
+++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
@@ -122,13 +122,13 @@ void CocoaScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
   }
 
   gfx::Rect local_bounds(GetLocalBounds());
-  cc::PaintFlags paint;
-  paint.setAntiAlias(true);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
-  paint.setColor(thumb_color);
+  cc::PaintFlags flags;
+  flags.setAntiAlias(true);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setColor(thumb_color);
   const SkScalar radius =
       std::min(local_bounds.width(), local_bounds.height());
-  canvas->DrawRoundRect(local_bounds, radius, paint);
+  canvas->DrawRoundRect(local_bounds, radius, flags);
 }
 
 bool CocoaScrollBarThumb::OnMousePressed(const ui::MouseEvent& event) {
@@ -263,23 +263,23 @@ void CocoaScrollBar::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawRect(track_rect, gradient);
 
   // Draw the inner border: top if horizontal, left if vertical.
-  cc::PaintFlags paint;
-  paint.setColor(kScrollerTrackInnerBorderColor);
+  cc::PaintFlags flags;
+  flags.setColor(kScrollerTrackInnerBorderColor);
   gfx::Rect inner_border(track_rect);
   if (IsHorizontal())
     inner_border.set_height(kScrollerTrackBorderWidth);
   else
     inner_border.set_width(kScrollerTrackBorderWidth);
-  canvas->DrawRect(inner_border, paint);
+  canvas->DrawRect(inner_border, flags);
 
   // Draw the outer border: bottom if horizontal, right if veritcal.
-  paint.setColor(kScrollerTrackOuterBorderColor);
+  flags.setColor(kScrollerTrackOuterBorderColor);
   gfx::Rect outer_border(inner_border);
   if (IsHorizontal())
     outer_border.set_y(track_rect.bottom());
   else
     outer_border.set_x(track_rect.right());
-  canvas->DrawRect(outer_border, paint);
+  canvas->DrawRect(outer_border, flags);
 }
 
 bool CocoaScrollBar::OnMousePressed(const ui::MouseEvent& event) {