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

ui/gfx/blit_unittest.cc

 // Copyright (c) 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 <stdint.h>
 
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 46 matching lines @@
       ASSERT_EQ(expected, *bitmap.getAddr32(x, y));
     }
   }
 }
 
 }  // namespace
 
 TEST(Blit, ScrollCanvas) {
   static const int kCanvasWidth = 5;
   static const int kCanvasHeight = 5;
-  std::unique_ptr<SkCanvas> canvas =
-      skia::CreatePlatformCanvas(kCanvasWidth, kCanvasHeight, true);
+  sk_sp<SkCanvas> canvas(
+      skia::CreatePlatformCanvas(kCanvasWidth, kCanvasHeight, true));
   uint8_t initial_values[kCanvasHeight][kCanvasWidth] = {
       {0x00, 0x01, 0x02, 0x03, 0x04},
       {0x10, 0x11, 0x12, 0x13, 0x14},
       {0x20, 0x21, 0x22, 0x23, 0x24},
       {0x30, 0x31, 0x32, 0x33, 0x34},
       {0x40, 0x41, 0x42, 0x43, 0x44}};
   SetToCanvas<5, 5>(canvas.get(), initial_values);
 
   // Sanity check on input.
   VerifyCanvasValues<5, 5>(canvas.get(), initial_values);
@@ skipping 66 matching lines @@
 }
 
 #if defined(OS_WIN)
 
 TEST(Blit, WithSharedMemory) {
   const int kCanvasWidth = 5;
   const int kCanvasHeight = 5;
   base::SharedMemory shared_mem;
   ASSERT_TRUE(shared_mem.CreateAnonymous(kCanvasWidth * kCanvasHeight));
   base::SharedMemoryHandle section = shared_mem.handle();
-  std::unique_ptr<SkCanvas> canvas = skia::CreatePlatformCanvas(
+  sk_sp<SkCanvas> canvas(skia::CreatePlatformCanvas(
       kCanvasWidth, kCanvasHeight, true, section.GetHandle(),
-      skia::RETURN_NULL_ON_FAILURE);
+      skia::RETURN_NULL_ON_FAILURE));
   ASSERT_TRUE(canvas);
   shared_mem.Close();
 
   uint8_t initial_values[kCanvasHeight][kCanvasWidth] = {
       {0x00, 0x01, 0x02, 0x03, 0x04},
       {0x10, 0x11, 0x12, 0x13, 0x14},
       {0x20, 0x21, 0x22, 0x23, 0x24},
       {0x30, 0x31, 0x32, 0x33, 0x34},
       {0x40, 0x41, 0x42, 0x43, 0x44}};
   SetToCanvas<5, 5>(canvas.get(), initial_values);
 
   // Sanity check on input.
   VerifyCanvasValues<5, 5>(canvas.get(), initial_values);
 }
 
 #endif