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

skia/ext/analysis_canvas_unittest.cc

 // Copyright 2013 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 "base/compiler_specific.h"
 #include "base/macros.h"
 #include "skia/ext/analysis_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ skipping 311 matching lines @@
   SolidColorFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 }
 
 TEST(AnalysisCanvasTest, EarlyOutNotSolid) {
   SkRTreeFactory factory;
   SkPictureRecorder recorder;
 
   // Create a picture with 3 commands, last of which is non-solid.
-  SkCanvas* record_canvas = recorder.beginRecording(256, 256, &factory);
+  sk_sp<SkCanvas> record_canvas = sk_ref_sp(recorder.beginRecording(256, 256, &factory));
 
   std::string text = "text";
   SkPoint point = SkPoint::Make(SkIntToScalar(25), SkIntToScalar(25));
 
   SkPaint paint;
   paint.setColor(SkColorSetARGB(255, 255, 255, 255));
   paint.setBlendMode(SkBlendMode::kSrcOver);
 
   record_canvas->drawRect(SkRect::MakeWH(256, 256), paint);
   record_canvas->drawRect(SkRect::MakeWH(256, 256), paint);
@@ skipping 103 matching lines @@
 
     SkRRect rr;
     rr.setRectRadii(bounding_rect, radii);
 
     canvas.clipRRect(rr);
     EXPECT_EQ(cases[i].expected, canvas.GetColorIfSolid(&outputColor)) << i;
   }
 }
 
 }  // namespace skia