Switch DrawImage to sk_sp<>

cc/playback/discardable_image_map.h

Index: cc/playback/discardable_image_map.h
diff --git a/cc/playback/discardable_image_map.h b/cc/playback/discardable_image_map.h
index 3b29da20b4260aa0eafeb04aef9fdb50f739f6ed..4f59b4683aa08a681b0cab4fc916e968613281b2 100644
--- a/cc/playback/discardable_image_map.h
+++ b/cc/playback/discardable_image_map.h
@@ -11,9 +11,9 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/rtree.h"
 #include "cc/playback/draw_image.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -39,7 +39,7 @@ class CC_EXPORT DiscardableImageMap {
 
    private:
     DiscardableImageMap* image_map_;
-    skia::RefPtr<SkCanvas> metadata_canvas_;
+    sk_sp<SkCanvas> metadata_canvas_;
   };
 
   DiscardableImageMap();
@@ -54,7 +54,7 @@ class CC_EXPORT DiscardableImageMap {
   friend class ScopedMetadataGenerator;
   friend class DiscardableImageMapTest;
 
-  skia::RefPtr<SkCanvas> BeginGeneratingMetadata(const gfx::Size& bounds);
+  sk_sp<SkCanvas> BeginGeneratingMetadata(const gfx::Size& bounds);
   void EndGeneratingMetadata();
 
   std::vector<std::pair<DrawImage, gfx::Rect>> all_images_;