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

ui/views/border_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 "ui/views/border.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 114 matching lines @@
 
 class BorderTest : public ViewsTestBase {
  public:
   void SetUp() override {
     ViewsTestBase::SetUp();
 
     view_.reset(new views::View());
     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 {
     ViewsTestBase::TearDown();
 
     canvas_.reset();
     sk_canvas_.reset();
     view_.reset();
   }
 
  protected:
   std::unique_ptr<views::View> view_;
-  std::unique_ptr<MockCanvas> sk_canvas_;
+  sk_sp<MockCanvas> sk_canvas_;
   std::unique_ptr<gfx::Canvas> canvas_;
 };
 
 TEST_F(BorderTest, NullBorder) {
   std::unique_ptr<Border> border(NullBorder());
   EXPECT_FALSE(border);
 }
 
 TEST_F(BorderTest, SolidBorder) {
   std::unique_ptr<Border> border(CreateSolidBorder(3, SK_ColorBLUE));
@@ skipping 86 matching lines @@
   EXPECT_EQ(kInsets, border->GetInsets());
 
   border->Paint(*view_, canvas_.get());
 
   // Expect that the Painter was called with our canvas and the view's size.
   EXPECT_EQ(canvas_.get(), painter_ptr->given_canvas());
   EXPECT_EQ(view_->size(), painter_ptr->given_size());
 }
 
 }  // namespace views