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

content/browser/compositor/software_output_device_mac.mm

 // Copyright 2014 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/browser/compositor/software_output_device_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
@@ skipping 96 matching lines @@
     if (io_result) {
       DLOG(ERROR) << "Failed to lock IOSurface " << io_result;
       return nullptr;
     }
   }
 
   SkPMColor* pixels = static_cast<SkPMColor*>(
       IOSurfaceGetBaseAddress(io_surfaces_[current_index_]));
   size_t stride = IOSurfaceGetBytesPerRow(io_surfaces_[current_index_]);
 
-  canvas_ = SkCanvas::MakeRasterDirectN32(pixel_size_.width(),
-                                          pixel_size_.height(), pixels, stride);
+  canvas_ = sk_sp<SkCanvas>(SkCanvas::NewRasterDirectN32(
+      pixel_size_.width(), pixel_size_.height(), pixels, stride));
 
   CopyPreviousBufferDamage(SkRegion(gfx::RectToSkIRect(new_damage_rect)));
 
   return canvas_.get();
 }
 
 void SoftwareOutputDeviceMac::EndPaint() {
   SoftwareOutputDevice::EndPaint();
   {
     TRACE_EVENT0("browser", "IOSurfaceUnlock");
@@ skipping 29 matching lines @@
 gfx::VSyncProvider* SoftwareOutputDeviceMac::GetVSyncProvider() {
   return this;
 }
 
 void SoftwareOutputDeviceMac::GetVSyncParameters(
     const gfx::VSyncProvider::UpdateVSyncCallback& callback) {
   update_vsync_callback_ = callback;
 }
 
 }  // namespace content