Clean up naming of paint-related identifiers

chrome/browser/profiles/profile_avatar_icon_util.cc

 // Copyright 2014 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 "chrome/browser/profiles/profile_avatar_icon_util.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/files/file_util.h"
@@ skipping 171 matching lines @@
 
     // Offset the rectangle by a half pixel so the border is drawn within the
     // appropriate pixels no matter the scale factor. Subtract 1 from the right
     // and bottom sizes to specify the endpoints, yielding -0.5.
     SkPath path;
     path.addRect(SkFloatToScalar(x + 0.5f),  // left
                  SkFloatToScalar(y + 0.5f),  // top
                  SkFloatToScalar(x + border_size - 0.5f),   // right
                  SkFloatToScalar(y + border_size - 0.5f));  // bottom
 
-    cc::PaintFlags paint;
-    paint.setColor(border_color);
-    paint.setStyle(cc::PaintFlags::kStroke_Style);
-    paint.setStrokeWidth(SkIntToScalar(1));
+    cc::PaintFlags flags;
+    flags.setColor(border_color);
+    flags.setStyle(cc::PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(SkIntToScalar(1));
 
-    canvas->DrawPath(path, paint);
+    canvas->DrawPath(path, flags);
   } else if (border_ == BORDER_ETCHED) {
     // Give the avatar an etched look by drawing a highlight on the bottom and
     // right edges.
     SkColor shadow_color = SkColorSetARGB(83, 0, 0, 0);
     SkColor highlight_color = SkColorSetARGB(96, 255, 255, 255);
 
-    cc::PaintFlags paint;
-    paint.setStyle(cc::PaintFlags::kStroke_Style);
-    paint.setStrokeWidth(SkIntToScalar(1));
+    cc::PaintFlags flags;
+    flags.setStyle(cc::PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(SkIntToScalar(1));
 
     SkPath path;
 
     // Left and top shadows. To support higher scale factors than 1, position
     // the orthogonal dimension of each line on the half-pixel to separate the
     // pixel. For a vertical line, this means adding 0.5 to the x-value.
     path.moveTo(SkFloatToScalar(x + 0.5f), SkIntToScalar(y + height_));
 
     // Draw up to the top-left. Stop with the y-value at a half-pixel.
     path.rLineTo(SkIntToScalar(0), SkFloatToScalar(-height_ + 0.5f));
 
     // Draw right to the top-right, stopping within the last pixel.
     path.rLineTo(SkFloatToScalar(width_ - 0.5f), SkIntToScalar(0));
 
-    paint.setColor(shadow_color);
-    canvas->DrawPath(path, paint);
+    flags.setColor(shadow_color);
+    canvas->DrawPath(path, flags);
 
     path.reset();
 
     // Bottom and right highlights. Note that the shadows own the shared corner
     // pixels, so reduce the sizes accordingly.
     path.moveTo(SkIntToScalar(x + 1), SkFloatToScalar(y + height_ - 0.5f));
 
     // Draw right to the bottom-right.
     path.rLineTo(SkFloatToScalar(width_ - 1.5f), SkIntToScalar(0));
 
     // Draw up to the top-right.
     path.rLineTo(SkIntToScalar(0), SkFloatToScalar(-height_ + 1.5f));
 
-    paint.setColor(highlight_color);
-    canvas->DrawPath(path, paint);
+    flags.setColor(highlight_color);
+    canvas->DrawPath(path, flags);
   }
 }
 
 }  // namespace
 
 namespace profiles {
 
 struct IconResourceInfo {
   int resource_id;
   const char* filename;
@@ skipping 320 matching lines @@
     avatar_info->SetString(
         "label", l10n_util::GetStringUTF16(
                      profiles::GetDefaultAvatarLabelResourceIDAtIndex(i)));
 
     avatars->Append(std::move(avatar_info));
   }
   return avatars;
 }
 
 }  // namespace profiles