cc: Clean up naming of paint-related identifiers

cc/trees/layer_tree_host_pixeltest_scrollbars.cc

 // Copyright 2016 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 <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/painted_scrollbar_layer.h"
@@ skipping 35 matching lines @@
   bool IsOverlay() const override { return false; }
   bool HasThumb() const override { return thumb_; }
   int ThumbThickness() const override { return rect_.width(); }
   int ThumbLength() const override { return rect_.height(); }
   gfx::Rect TrackRect() const override { return rect_; }
   float ThumbOpacity() const override { return 1.f; }
   bool NeedsPaintPart(ScrollbarPart part) const override { return true; }
   void PaintPart(PaintCanvas* canvas,
                  ScrollbarPart part,
                  const gfx::Rect& content_rect) override {
-    PaintFlags paint;
-    paint.setStyle(PaintFlags::kStroke_Style);
-    paint.setStrokeWidth(SkIntToScalar(paint_scale_));
-    paint.setColor(color_);
+    PaintFlags flags;
+    flags.setStyle(PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(SkIntToScalar(paint_scale_));
+    flags.setColor(color_);
 
     gfx::Rect inset_rect = content_rect;
     while (!inset_rect.IsEmpty()) {
       int big = paint_scale_ + 2;
       int small = paint_scale_;
       inset_rect.Inset(big, big, small, small);
-      canvas->drawRect(RectToSkRect(inset_rect), paint);
+      canvas->drawRect(RectToSkRect(inset_rect), flags);
       inset_rect.Inset(big, big, small, small);
     }
   }
 
   void set_paint_scale(int scale) { paint_scale_ = scale; }
 
  private:
   int paint_scale_ = 4;
   bool thumb_ = false;
   SkColor color_ = SK_ColorGREEN;
@@ skipping 88 matching lines @@
   layer->SetTransform(scale_transform);
 
   RunPixelTest(PIXEL_TEST_GL, background,
                base::FilePath(FILE_PATH_LITERAL("spiral_64_scale.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID