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

content/renderer/pepper/ppb_image_data_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_image_data_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 
@@ skipping 153 matching lines @@
   return !!mapped_canvas_.get();
 }
 
 TransportDIB* ImageDataPlatformBackend::GetTransportDIB() const {
   return dib_.get();
 }
 
 void* ImageDataPlatformBackend::Map() {
   if (!mapped_canvas_) {
     const bool is_opaque = false;
-    mapped_canvas_ = dib_->GetPlatformCanvas(width_, height_, is_opaque);
+    mapped_canvas_ =
+        sk_sp<SkCanvas>(dib_->GetPlatformCanvas(width_, height_, is_opaque));
     if (!mapped_canvas_)
       return NULL;
   }
   SkPixmap pixmap;
   skia::GetWritablePixels(mapped_canvas_.get(), &pixmap);
   DCHECK(pixmap.addr());
   // SkPixmap does not manage the lifetime of this pointer, so it remains
   // valid after the object goes out of scope. It will become invalid if
   // the canvas' backing is destroyed or a pending saveLayer() is resolved.
   return pixmap.writable_addr32(0, 0);
@@ skipping 57 matching lines @@
 
 TransportDIB* ImageDataSimpleBackend::GetTransportDIB() const { return NULL; }
 
 void* ImageDataSimpleBackend::Map() {
   DCHECK(shared_memory_.get());
   if (map_count_++ == 0) {
     shared_memory_->Map(skia_bitmap_.getSize());
     skia_bitmap_.setPixels(shared_memory_->memory());
     // Our platform bitmaps are set to opaque by default, which we don't want.
     skia_bitmap_.setAlphaType(kPremul_SkAlphaType);
-    skia_canvas_ = base::MakeUnique<SkCanvas>(skia_bitmap_);
+    skia_canvas_ = sk_make_sp<SkCanvas>(skia_bitmap_);
     return skia_bitmap_.getAddr32(0, 0);
   }
   return shared_memory_->memory();
 }
 
 void ImageDataSimpleBackend::Unmap() {
   if (--map_count_ == 0)
     shared_memory_->Unmap();
 }
 
@@ skipping 14 matching lines @@
   return skia_canvas_.get();
 }
 
 SkBitmap ImageDataSimpleBackend::GetMappedBitmap() const {
   if (!IsMapped())
     return SkBitmap();
   return skia_bitmap_;
 }
 
 }  // namespace content