ui: Clean up naming of paint-related identifiers

ui/views/controls/button/label_button_border.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/label_button_border.h"
 
 #include "base/logging.h"
 #include "cc/paint/paint_flags.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/animation.h"
@@ skipping 136 matching lines @@
 
     {
       // First, modulate the background by 1 - alpha.
       cc::PaintCanvasAutoRestore auto_restore(canvas->sk_canvas(), false);
       canvas->sk_canvas()->saveLayerAlpha(&sk_rect, 255 - fg_alpha);
       state = native_theme_delegate->GetBackgroundThemeState(&extra);
       PaintHelper(this, canvas, state, rect, extra);
     }
 
     // Then modulate the foreground by alpha, and blend using kPlus_Mode.
-    cc::PaintFlags paint;
-    paint.setAlpha(fg_alpha);
-    paint.setBlendMode(SkBlendMode::kPlus);
-    canvas->sk_canvas()->saveLayer(&sk_rect, &paint);
+    cc::PaintFlags flags;
+    flags.setAlpha(fg_alpha);
+    flags.setBlendMode(SkBlendMode::kPlus);
+    canvas->sk_canvas()->saveLayer(&sk_rect, &flags);
     state = native_theme_delegate->GetForegroundThemeState(&extra);
     PaintHelper(this, canvas, state, rect, extra);
   } else {
     PaintHelper(this, canvas, state, rect, extra);
   }
 }
 
 gfx::Size LabelButtonAssetBorder::GetMinimumSize() const {
   gfx::Size minimum_size;
   for (int i = 0; i < 2; ++i) {
@@ skipping 10 matching lines @@
   return painters_[focused ? 1 : 0][state].get();
 }
 
 void LabelButtonAssetBorder::SetPainter(bool focused,
                                         Button::ButtonState state,
                                         std::unique_ptr<Painter> painter) {
   painters_[focused ? 1 : 0][state] = std::move(painter);
 }
 
 }  // namespace views