Clean up naming of paint-related identifiers

chrome/browser/ui/views/status_bubble_views.cc

Index: chrome/browser/ui/views/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 20683e917fd31e352800dad44c0fe6fc546518ef..fe7e3d461b7bd55a409162378357fa821b098d7e 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -20,7 +20,6 @@
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #include "services/service_manager/runner/common/client_util.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 #include "ui/base/theme_provider.h"
@@ -457,25 +456,25 @@ void StatusBubbleViews::StatusView::OnPaint(gfx::Canvas* canvas) {
   SkPath path;
   path.addRoundRect(gfx::RectFToSkRect(bubble_rect), rad);
 
-  cc::PaintFlags paint;
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(1);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(1);
+  flags.setAntiAlias(true);
 
   SkPath stroke_path;
-  paint.getFillPath(path, &stroke_path);
+  flags.getFillPath(path, &stroke_path);
 
   // Get the fill path by subtracting the shadow so they align neatly.
   SkPath fill_path;
   Op(path, stroke_path, kDifference_SkPathOp, &fill_path);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
   const SkColor bubble_color =
       theme_provider_->GetColor(ThemeProperties::COLOR_TOOLBAR);
-  paint.setColor(bubble_color);
-  canvas->sk_canvas()->drawPath(fill_path, paint);
+  flags.setColor(bubble_color);
+  canvas->sk_canvas()->drawPath(fill_path, flags);
 
-  paint.setColor(kShadowColor);
-  canvas->sk_canvas()->drawPath(stroke_path, paint);
+  flags.setColor(kShadowColor);
+  canvas->sk_canvas()->drawPath(stroke_path, flags);
 
   canvas->Restore();