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

cc/blimp/compositor_state_deserializer_unittest.cc

 // Copyright 2016 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 "compositor_state_deserializer.h"
 
 #include "base/run_loop.h"
 #include "cc/animation/animation_host.h"
 #include "cc/blimp/client_picture_cache.h"
 #include "cc/blimp/compositor_proto_state.h"
@@ skipping 321 matching lines @@
 TEST_F(CompositorStateDeserializerTest, PictureLayer) {
   scoped_refptr<Layer> root_layer = Layer::Create();
   root_layer->SetBounds(gfx::Size(10, 10));
   root_layer->SetIsDrawable(true);
   layer_tree_host_remote_->GetLayerTree()->SetRootLayer(root_layer);
 
   gfx::Size layer_size = gfx::Size(5, 5);
 
   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();
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;
   scoped_refptr<DisplayItemList> display_list =
       DisplayItemList::Create(settings);
   const gfx::Rect visual_rect(0, 0, 42, 42);
   display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(visual_rect,
@@ skipping 37 matching lines @@
           picture_layer2->id()));
   scoped_refptr<DisplayItemList> client_display_list2 =
       client_picture_layer2->client()->PaintContentsToDisplayList(
           ContentLayerClient::PaintingControlSetting::PAINTING_BEHAVIOR_NORMAL);
   EXPECT_TRUE(AreDisplayListDrawingResultsSame(
       gfx::Rect(layer_size), display_list.get(), client_display_list2.get()));
 }
 
 }  // namespace
 }  // namespace cc