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

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index c51ef30315f664206e9501ccc234b411236c93a4..5091fcacd3d871eee9fa0d9b21d1095453e3d7dd 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -3645,7 +3645,7 @@ TEST_P(RenderTextTest, TextDoesntClip) {
 
   sk_sp<SkSurface> surface =
       SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
-  Canvas canvas(surface->getCanvas(), 1.0f);
+  Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f);
   RenderText* render_text = GetRenderText();
   render_text->SetHorizontalAlignment(ALIGN_LEFT);
   render_text->SetColor(SK_ColorBLACK);
@@ -3738,7 +3738,7 @@ TEST_P(RenderTextTest, TextDoesClip) {
 
   sk_sp<SkSurface> surface =
       SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
-  Canvas canvas(surface->getCanvas(), 1.0f);
+  Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f);
   RenderText* render_text = GetRenderText();
   render_text->SetHorizontalAlignment(ALIGN_LEFT);
   render_text->SetColor(SK_ColorBLACK);