ash: Clean up naming of paint-related identifiers

ash/touch_hud/touch_hud_renderer.cc

Index: ash/touch_hud/touch_hud_renderer.cc
diff --git a/ash/touch_hud/touch_hud_renderer.cc b/ash/touch_hud/touch_hud_renderer.cc
index 9430f0881dffedc1653733228b9c6849714f556d..daedba347e386f07ca1079a7a497a667fb1ae376 100644
--- a/ash/touch_hud/touch_hud_renderer.cc
+++ b/ash/touch_hud/touch_hud_renderer.cc
@@ -40,8 +40,8 @@ class TouchPointView : public views::View,
 
     SetSize(gfx::Size(2 * kPointRadius + 2, 2 * kPointRadius + 2));
 
-    stroke_paint_.setStyle(cc::PaintFlags::kStroke_Style);
-    stroke_paint_.setColor(kProjectionStrokeColor);
+    stroke_flags_.setStyle(cc::PaintFlags::kStroke_Style);
+    stroke_flags_.setColor(kProjectionStrokeColor);
 
     gradient_colors_[0] = kProjectionFillColor;
     gradient_colors_[1] = kProjectionStrokeColor;
@@ -82,16 +82,16 @@ class TouchPointView : public views::View,
     int alpha = kProjectionAlpha;
     if (fadeout_)
       alpha = static_cast<int>(fadeout_->CurrentValueBetween(alpha, 0));
-    fill_paint_.setAlpha(alpha);
-    stroke_paint_.setAlpha(alpha);
-    fill_paint_.setShader(SkGradientShader::MakeRadial(
+    fill_flags_.setAlpha(alpha);
+    stroke_flags_.setAlpha(alpha);
+    fill_flags_.setShader(SkGradientShader::MakeRadial(
         gradient_center_, SkIntToScalar(kPointRadius), gradient_colors_,
         gradient_pos_, arraysize(gradient_colors_),
         SkShader::kMirror_TileMode));
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
-                       fill_paint_);
+                       fill_flags_);
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
-                       stroke_paint_);
+                       stroke_flags_);
   }
 
   // Overridden from gfx::AnimationDelegate.
@@ -120,8 +120,8 @@ class TouchPointView : public views::View,
   const gfx::Point circle_center_;
   const SkPoint gradient_center_;
 
-  cc::PaintFlags fill_paint_;
-  cc::PaintFlags stroke_paint_;
+  cc::PaintFlags fill_flags_;
+  cc::PaintFlags stroke_flags_;
   SkColor gradient_colors_[2];
   SkScalar gradient_pos_[2];