ui: Clean up naming of paint-related identifiers

ui/views/color_chooser/color_chooser_view.cc

Index: ui/views/color_chooser/color_chooser_view.cc
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index a98be0e2b63d354871a386d4b1991a96470e647c..411cdb9885b8098e8da13dff1eb5c06dc0c3eb59 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -103,10 +103,10 @@ void DrawGradientRect(const gfx::Rect& rect, SkColor start_color,
     points[1].iset(rect.width() + 1, 0);
   else
     points[1].iset(0, rect.height() + 1);
-  cc::PaintFlags paint;
-  paint.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
+  cc::PaintFlags flags;
+  flags.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
       points, colors, NULL, 2, SkShader::kClamp_TileMode)));
-  canvas->DrawRect(rect, paint);
+  canvas->DrawRect(rect, flags);
 }
 
 }  // namespace
@@ -211,11 +211,11 @@ void ColorChooserView::HueView::OnPaint(gfx::Canvas* canvas) {
       SkIntToScalar(width()) - SK_ScalarHalf,
       SkIntToScalar(level_ - kHueIndicatorSize));
 
-  cc::PaintFlags indicator_paint;
-  indicator_paint.setColor(SK_ColorBLACK);
-  indicator_paint.setStyle(cc::PaintFlags::kFill_Style);
-  canvas->DrawPath(left_indicator_path, indicator_paint);
-  canvas->DrawPath(right_indicator_path, indicator_paint);
+  cc::PaintFlags indicator_flags;
+  indicator_flags.setColor(SK_ColorBLACK);
+  indicator_flags.setStyle(cc::PaintFlags::kFill_Style);
+  canvas->DrawPath(left_indicator_path, indicator_flags);
+  canvas->DrawPath(right_indicator_path, indicator_flags);
 }
 
 ////////////////////////////////////////////////////////////////////////////////