Use sk_sp-based picture recording APIs

cc/playback/drawing_display_item.h

Index: cc/playback/drawing_display_item.h
diff --git a/cc/playback/drawing_display_item.h b/cc/playback/drawing_display_item.h
index 80459040932c561fdab264e487dbe3196d0346f2..0e7c640154f0f221c346cf2730d627e93ac0dd07 100644
--- a/cc/playback/drawing_display_item.h
+++ b/cc/playback/drawing_display_item.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/playback/display_item.h"
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/point_f.h"
 
 class SkCanvas;
@@ -22,7 +22,7 @@ class ImageSerializationProcessor;
 class CC_EXPORT DrawingDisplayItem : public DisplayItem {
  public:
   DrawingDisplayItem();
-  explicit DrawingDisplayItem(skia::RefPtr<const SkPicture> picture);
+  explicit DrawingDisplayItem(sk_sp<const SkPicture> picture);
   explicit DrawingDisplayItem(
       const proto::DisplayItem& proto,
       ImageSerializationProcessor* image_serialization_processor);
@@ -45,9 +45,9 @@ class CC_EXPORT DrawingDisplayItem : public DisplayItem {
   void CloneTo(DrawingDisplayItem* item) const;
 
  private:
-  void SetNew(skia::RefPtr<const SkPicture> picture);
+  void SetNew(sk_sp<const SkPicture> picture);
 
-  skia::RefPtr<const SkPicture> picture_;
+  sk_sp<const SkPicture> picture_;
 };
 
 }  // namespace cc