Rename paint data structures

content/renderer/sad_plugin.cc

Index: content/renderer/sad_plugin.cc
diff --git a/content/renderer/sad_plugin.cc b/content/renderer/sad_plugin.cc
index f2b0886669c7ef4d0888979eb0894d9aea2ab40d..64588d72d7d8e6f5ef4c0d7f2bde3bda602c6d51 100644
--- a/content/renderer/sad_plugin.cc
+++ b/content/renderer/sad_plugin.cc
@@ -7,7 +7,8 @@
 #include <algorithm>
 #include <memory>
 
-#include "skia/ext/platform_canvas.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace content {
@@ -18,14 +19,14 @@ void PaintSadPlugin(blink::WebCanvas* webcanvas,
   const int width = plugin_rect.width();
   const int height = plugin_rect.height();
 
-  SkCanvas* canvas = webcanvas;
-  SkAutoCanvasRestore auto_restore(canvas, true);
+  cc::PaintCanvas* canvas = webcanvas;
+  cc::PaintCanvasAutoRestore auto_restore(canvas, true);
   // We draw the sad-plugin bitmap at the origin of canvas.
   // Add a translation so that it appears at the origin of plugin rect.
   canvas->translate(plugin_rect.x(), plugin_rect.y());
 
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
+  cc::PaintFlags paint;
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setColor(SK_ColorBLACK);
   canvas->drawRectCoords(0, 0, SkIntToScalar(width), SkIntToScalar(height),
                          paint);