ui: Clean up naming of paint-related identifiers

ui/views/controls/tabbed_pane/tabbed_pane.cc

Index: ui/views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index fd30e6bf59e2a9d350f5652228bc37d7d35382ce..8a8c7536043eda2bb722ffed691d9af57742c7b8 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -340,9 +340,9 @@ const char* TabStrip::GetClassName() const {
 }
 
 void TabStrip::OnPaintBorder(gfx::Canvas* canvas) {
-  cc::PaintFlags paint;
-  paint.setColor(kTabBorderColor);
-  paint.setStrokeWidth(kTabBorderThickness);
+  cc::PaintFlags fill_flags;
+  fill_flags.setColor(kTabBorderColor);
+  fill_flags.setStrokeWidth(kTabBorderThickness);
   SkScalar line_y = SkIntToScalar(height()) - (kTabBorderThickness / 2);
   SkScalar line_end = SkIntToScalar(width());
   int selected_tab_index = GetSelectedTabIndex();
@@ -361,13 +361,13 @@ void TabStrip::OnPaintBorder(gfx::Canvas* canvas) {
     path.rLineTo(0, tab_height);
     path.lineTo(line_end, line_y);
 
-    cc::PaintFlags paint;
-    paint.setStyle(cc::PaintFlags::kStroke_Style);
-    paint.setColor(kTabBorderColor);
-    paint.setStrokeWidth(kTabBorderThickness);
-    canvas->DrawPath(path, paint);
+    cc::PaintFlags fill_flags;
+    fill_flags.setStyle(cc::PaintFlags::kStroke_Style);
+    fill_flags.setColor(kTabBorderColor);
+    fill_flags.setStrokeWidth(kTabBorderThickness);
+    canvas->DrawPath(path, fill_flags);
   } else {
-    canvas->sk_canvas()->drawLine(0, line_y, line_end, line_y, paint);
+    canvas->sk_canvas()->drawLine(0, line_y, line_end, line_y, fill_flags);
   }
 }