Use sk_sp-based picture recording APIs

cc/layers/picture_image_layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/picture_image_layer.h"
 
 #include <stddef.h>
 
 #include "cc/layers/picture_image_layer_impl.h"
 #include "cc/playback/display_item_list_settings.h"
@@ skipping 62 matching lines @@
       SkFloatToScalar(static_cast<float>(bounds().width()) / image_->width());
   SkScalar content_to_layer_scale_y =
       SkFloatToScalar(static_cast<float>(bounds().height()) / image_->height());
   canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y);
 
   // Because Android WebView resourceless software draw mode rasters directly
   // to the root canvas, this draw must use the kSrcOver_Mode so that
   // transparent images blend correctly.
   canvas->drawImage(image_.get(), 0, 0);
 
-  skia::RefPtr<SkPicture> picture =
-      skia::AdoptRef(recorder.endRecordingAsPicture());
-  display_list->CreateAndAppendItem<DrawingDisplayItem>(PaintableRegion(),
-                                                        std::move(picture));
+  display_list->CreateAndAppendItem<DrawingDisplayItem>(
+      PaintableRegion(), recorder.finishRecordingAsPicture());
 
   display_list->Finalize();
   return display_list;
 }
 
 bool PictureImageLayer::FillsBoundsCompletely() const {
   return false;
 }
 
 size_t PictureImageLayer::GetApproximateUnsharedMemoryUsage() const {
   return 0;
 }
 
 }  // namespace cc