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

ui/views/border_unittest.cc

Index: ui/views/border_unittest.cc
diff --git a/ui/views/border_unittest.cc b/ui/views/border_unittest.cc
index ab428df65e6871d2835e3674e095315c6b51e6c5..c9b5b6c033f35dd20a24e917c95b979d5810d160 100644
--- a/ui/views/border_unittest.cc
+++ b/ui/views/border_unittest.cc
@@ -132,7 +132,7 @@ class BorderTest : public ViewsTestBase {
     view_->SetSize(gfx::Size(100, 50));
     // The canvas should be much bigger than the view.
     sk_canvas_.reset(new MockCanvas(1000, 500));
-    canvas_.reset(new gfx::Canvas(sk_canvas_.get(), 1.0f));
+    canvas_.reset(new gfx::Canvas(sk_canvas_, 1.0f));
   }
 
   void TearDown() override {
@@ -145,7 +145,7 @@ class BorderTest : public ViewsTestBase {
 
  protected:
   std::unique_ptr<views::View> view_;
-  std::unique_ptr<MockCanvas> sk_canvas_;
+  sk_sp<MockCanvas> sk_canvas_;
   std::unique_ptr<gfx::Canvas> canvas_;
 };