Rename paint data structures

chrome/browser/ui/views/infobars/infobar_background.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 "chrome/browser/ui/views/infobars/infobar_background.h"
 
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
 #include "components/infobars/core/infobar.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/view.h"
 
 InfoBarBackground::InfoBarBackground(
     infobars::InfoBarDelegate::Type infobar_type) {
@@ skipping 39 matching lines @@
       stroke_path.lineTo(infobar_width - 1, r_arrow_height);
 
       // Add SK_ScalarHalf to both axes to place the path on pixel centers.
       stroke_path.offset(SK_ScalarHalf, SK_ScalarHalf);
 
       fill_path = stroke_path;
       fill_path.close();
     }
   }
   fill_path.addRect(0, arrow_height, infobar_width, scale(infobar->height()));
-  SkPaint fill;
-  fill.setStyle(SkPaint::kFill_Style);
+  cc::PaintFlags fill;
+  fill.setStyle(cc::PaintFlags::kFill_Style);
   fill.setColor(get_color());
   canvas->DrawPath(fill_path, fill);
 
-  SkPaint stroke;
-  stroke.setStyle(SkPaint::kStroke_Style);
+  cc::PaintFlags stroke;
+  stroke.setStyle(cc::PaintFlags::kStroke_Style);
   const int kSeparatorThicknessPx = 1;
   stroke.setStrokeWidth(SkIntToScalar(kSeparatorThicknessPx));
   stroke.setColor(separator_color);
   stroke.setAntiAlias(true);
   canvas->DrawPath(stroke_path, stroke);
 
   // Bottom separator.
   stroke.setAntiAlias(false);
   gfx::SizeF view_size_px = gfx::ScaleSize(gfx::SizeF(view->size()), dsf);
   SkScalar y = SkIntToScalar(view_size_px.height() - kSeparatorThicknessPx) +
                SK_ScalarHalf;
   SkScalar w = SkFloatToScalar(view_size_px.width());
   canvas->sk_canvas()->drawLine(0, y, w, y, stroke);
 }