Revert of Make cc/paint have concrete types

ash/common/shelf/shelf_button.cc

 // Copyright 2013 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 "ash/common/shelf/shelf_button.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
@@ skipping 136 matching lines @@
     DCHECK_EQ(width(), height());
     DCHECK_EQ(kIndicatorRadiusDip, width() / 2);
     const float dsf = canvas->UndoDeviceScaleFactor();
     const int kStrokeWidthPx = 1;
     gfx::PointF center = gfx::RectF(GetLocalBounds()).CenterPoint();
     center.Scale(dsf);
 
     // Fill the center.
     cc::PaintFlags flags;
     flags.setColor(kIndicatorColor);
-    flags.setAntiAlias(true);
+    flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
     canvas->DrawCircle(center, dsf * kIndicatorRadiusDip - kStrokeWidthPx,
                        flags);
 
     // Stroke the border.
     flags.setColor(SkColorSetA(SK_ColorBLACK, 0x4D));
-    flags.setStyle(cc::PaintFlags::kStroke_Style);
+    flags.setStyle(SkPaint::kStroke_Style);
     canvas->DrawCircle(
         center, dsf * kIndicatorRadiusDip - kStrokeWidthPx / 2.0f, flags);
   }
 
   // ShelfButtonAnimation::Observer
   void AnimationProgressed() override {
     UpdateAnimating();
     SchedulePaint();
   }
 
@@ skipping 331 matching lines @@
   icon_view_->SetHorizontalAlignment(is_horizontal_shelf
                                          ? views::ImageView::CENTER
                                          : views::ImageView::LEADING);
   icon_view_->SetVerticalAlignment(is_horizontal_shelf
                                        ? views::ImageView::LEADING
                                        : views::ImageView::CENTER);
   SchedulePaint();
 }
 
 }  // namespace ash