ui: Clean up naming of paint-related identifiers

ui/views/controls/focus_ring.cc

Index: ui/views/controls/focus_ring.cc
diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc
index c8c4d472abd18dc6f53ee7971c7deeefb5e002b6..b905823817e7bdb568f0a5be6395b953226dec06 100644
--- a/ui/views/controls/focus_ring.cc
+++ b/ui/views/controls/focus_ring.cc
@@ -69,19 +69,19 @@ void FocusRing::Layout() {
 }
 
 void FocusRing::OnPaint(gfx::Canvas* canvas) {
-  cc::PaintFlags paint;
-  paint.setAntiAlias(true);
-  paint.setColor(
+  cc::PaintFlags flags;
+  flags.setAntiAlias(true);
+  flags.setColor(
       SkColorSetA(GetNativeTheme()->GetSystemColor(
                       override_color_id_ != ui::NativeTheme::kColorId_NumColors
                           ? override_color_id_
                           : ui::NativeTheme::kColorId_FocusedBorderColor),
                   0x66));
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(kFocusHaloThicknessDp);
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(kFocusHaloThicknessDp);
   gfx::RectF rect(GetLocalBounds());
   rect.Inset(gfx::InsetsF(kFocusHaloThicknessDp / 2.f));
-  canvas->DrawRoundRect(rect, kFocusHaloCornerRadiusDp, paint);
+  canvas->DrawRoundRect(rect, kFocusHaloCornerRadiusDp, flags);
 }
 
 FocusRing::FocusRing()