Use sk_sp-based picture recording APIs

cc/playback/display_list_raster_source.cc

Index: cc/playback/display_list_raster_source.cc
diff --git a/cc/playback/display_list_raster_source.cc b/cc/playback/display_list_raster_source.cc
index a6d2c841b6a3b6bf7db3c554a1b3979c5a6d6f5e..970648fbade4d25790a02b26f342a4002f9c5c62 100644
--- a/cc/playback/display_list_raster_source.cc
+++ b/cc/playback/display_list_raster_source.cc
@@ -260,7 +260,7 @@ void DisplayListRasterSource::RasterCommon(
   }
 }
 
-skia::RefPtr<SkPicture> DisplayListRasterSource::GetFlattenedPicture() {
+sk_sp<SkPicture> DisplayListRasterSource::GetFlattenedPicture() {
   TRACE_EVENT0("cc", "DisplayListRasterSource::GetFlattenedPicture");
 
   gfx::Rect display_list_rect(size_);
@@ -272,10 +272,8 @@ skia::RefPtr<SkPicture> DisplayListRasterSource::GetFlattenedPicture() {
                                1.f);
     RasterCommon(canvas, nullptr, display_list_rect, display_list_rect, 1.f);
   }
-  skia::RefPtr<SkPicture> picture =
-      skia::AdoptRef(recorder.endRecordingAsPicture());
 
-  return picture;
+  return recorder.finishRecordingAsPicture();
 }
 
 size_t DisplayListRasterSource::GetPictureMemoryUsage() const {