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

cc/blimp/compositor_state_deserializer_unittest.cc

Index: cc/blimp/compositor_state_deserializer_unittest.cc
diff --git a/cc/blimp/compositor_state_deserializer_unittest.cc b/cc/blimp/compositor_state_deserializer_unittest.cc
index e044e66f878ff290e3818ed33f3efb5987aec79b..46472928b4228ecf9edcf63434d60ab45b506d76 100644
--- a/cc/blimp/compositor_state_deserializer_unittest.cc
+++ b/cc/blimp/compositor_state_deserializer_unittest.cc
@@ -339,11 +339,11 @@ TEST_F(CompositorStateDeserializerTest, PictureLayer) {
 
   gfx::PointF offset(2.f, 3.f);
   SkPictureRecorder recorder;
-  SkCanvas* canvas;
+  sk_sp<SkCanvas> canvas;
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
-  canvas = recorder.beginRecording(SkRect::MakeXYWH(
-      offset.x(), offset.y(), layer_size.width(), layer_size.height()));
+  canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
+      offset.x(), offset.y(), layer_size.width(), layer_size.height())));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
   sk_sp<SkPicture> test_picture = recorder.finishRecordingAsPicture();