Remove all uses of skia::RefPtr and stale includes

ui/gfx/canvas.cc

Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index b88fd2d55128a7e68c91c20b20205a2ca8ff61af..559310950df192612907ba7fda2f6054396af078 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
@@ -27,9 +28,9 @@ namespace gfx {
 Canvas::Canvas(const Size& size, float image_scale, bool is_opaque)
     : image_scale_(image_scale) {
   Size pixel_size = ScaleToCeiledSize(size, image_scale);
-  canvas_ = skia::AdoptRef(skia::CreatePlatformCanvas(pixel_size.width(),
-                                                      pixel_size.height(),
-                                                      is_opaque));
+  canvas_ = sk_sp<SkCanvas>(skia::CreatePlatformCanvas(pixel_size.width(),
+                                                       pixel_size.height(),
+                                                       is_opaque));
 #if !defined(USE_CAIRO)
   // skia::PlatformCanvas instances are initialized to 0 by Cairo, but
   // uninitialized on other platforms.
@@ -43,7 +44,7 @@ Canvas::Canvas(const Size& size, float image_scale, bool is_opaque)
 
 Canvas::Canvas(const ImageSkiaRep& image_rep, bool is_opaque)
     : image_scale_(image_rep.scale()),
-      canvas_(skia::AdoptRef(
+      canvas_(sk_sp<SkCanvas>(
           skia::CreatePlatformCanvas(image_rep.pixel_width(),
                                      image_rep.pixel_height(),
                                      is_opaque))) {
@@ -54,10 +55,10 @@ Canvas::Canvas(const ImageSkiaRep& image_rep, bool is_opaque)
 
 Canvas::Canvas()
     : image_scale_(1.f),
-      canvas_(skia::AdoptRef(skia::CreatePlatformCanvas(0, 0, false))) {}
+      canvas_(sk_sp<SkCanvas>(skia::CreatePlatformCanvas(0, 0, false))) {}
 
-Canvas::Canvas(const skia::RefPtr<SkCanvas>& canvas, float image_scale)
-    : image_scale_(image_scale), canvas_(canvas) {
+Canvas::Canvas(const sk_sp<SkCanvas> canvas, float image_scale)

[danakj, 2016/05/04 19:44:53]

remove const

[tomhudson, 2016/05/04 19:59:53]

Oops, good catch.
Done.

+    : image_scale_(image_scale), canvas_(std::move(canvas)) {
   DCHECK(canvas);
 }
 
@@ -69,9 +70,9 @@ void Canvas::RecreateBackingCanvas(const Size& size,
                                    bool is_opaque) {
   image_scale_ = image_scale;
   Size pixel_size = ScaleToFlooredSize(size, image_scale);
-  canvas_ = skia::AdoptRef(skia::CreatePlatformCanvas(pixel_size.width(),
-                                                      pixel_size.height(),
-                                                      is_opaque));
+  canvas_ = sk_sp<SkCanvas>(skia::CreatePlatformCanvas(pixel_size.width(),
+                                                       pixel_size.height(),
+                                                       is_opaque));
   SkScalar scale_scalar = SkFloatToScalar(image_scale);
   canvas_->scale(scale_scalar, scale_scalar);
 }