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

skia/ext/bitmap_platform_device_mac_unittest.cc

Index: skia/ext/bitmap_platform_device_mac_unittest.cc
diff --git a/skia/ext/bitmap_platform_device_mac_unittest.cc b/skia/ext/bitmap_platform_device_mac_unittest.cc
index b1f6ee74dab194fbcb6c7295996a3f66e0aea036..9d8020b0d6990aa23986119523380538bb52b9d9 100644
--- a/skia/ext/bitmap_platform_device_mac_unittest.cc
+++ b/skia/ext/bitmap_platform_device_mac_unittest.cc
@@ -32,7 +32,8 @@ TEST_F(BitmapPlatformDeviceMacTest, ClipRectTransformWithTranslate) {
   SkMatrix transform;
   transform.setTranslate(50, 140);
 
-  sk_sp<SkCanvas> canvas(skia::CreateCanvas(bitmap_, CRASH_ON_FAILURE));
+  std::unique_ptr<SkCanvas> canvas =
+      skia::CreateCanvas(bitmap_, CRASH_ON_FAILURE);
   canvas->setMatrix(transform);
 
   ScopedPlatformPaint p(canvas.get());
@@ -50,7 +51,8 @@ TEST_F(BitmapPlatformDeviceMacTest, ClipRectTransformWithScale) {
   SkMatrix transform;
   transform.setScale(0.5, 0.5);
 
-  sk_sp<SkCanvas> canvas(skia::CreateCanvas(bitmap_, CRASH_ON_FAILURE));
+  std::unique_ptr<SkCanvas> canvas =
+      skia::CreateCanvas(bitmap_, CRASH_ON_FAILURE);
   canvas->setMatrix(transform);
 
   ScopedPlatformPaint p(canvas.get());