Revert "Revert "Change call-sites now that SkCanvas is not ref-counted""

cc/playback/discardable_image_map.cc

Index: cc/playback/discardable_image_map.cc
diff --git a/cc/playback/discardable_image_map.cc b/cc/playback/discardable_image_map.cc
index e79d153febf06fca608cb7f60ca359b1ca1691ff..74f830df3470eb8c84e1f8cd846f2d859c4ece77 100644
--- a/cc/playback/discardable_image_map.cc
+++ b/cc/playback/discardable_image_map.cc
@@ -10,6 +10,7 @@
 #include <limits>
 
 #include "base/containers/adapters.h"
+#include "base/memory/ptr_util.h"
 #include "cc/base/math_util.h"
 #include "cc/playback/display_item_list.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
@@ -197,10 +198,10 @@ DiscardableImageMap::DiscardableImageMap() {}
 
 DiscardableImageMap::~DiscardableImageMap() {}
 
-sk_sp<SkCanvas> DiscardableImageMap::BeginGeneratingMetadata(
+std::unique_ptr<SkCanvas> DiscardableImageMap::BeginGeneratingMetadata(
     const gfx::Size& bounds) {
   DCHECK(all_images_.empty());
-  return sk_make_sp<DiscardableImagesMetadataCanvas>(
+  return base::MakeUnique<DiscardableImagesMetadataCanvas>(
       bounds.width(), bounds.height(), &all_images_, &image_id_to_region_);
 }