Border::CreateBorderPainter now takes a unique_ptr, not a raw pointer.

ui/views/border.cc

 // Copyright (c) 2012 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 <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 121 matching lines @@
 gfx::Insets EmptyBorder::GetInsets() const {
   return insets_;
 }
 
 gfx::Size EmptyBorder::GetMinimumSize() const {
   return gfx::Size();
 }
 
 class BorderPainter : public Border {
  public:
-  BorderPainter(Painter* painter, const gfx::Insets& insets);
+  BorderPainter(std::unique_ptr<Painter> painter, const gfx::Insets& insets);
 
   // Overridden from Border:
   void Paint(const View& view, gfx::Canvas* canvas) override;
   gfx::Insets GetInsets() const override;
   gfx::Size GetMinimumSize() const override;
 
  private:
   std::unique_ptr<Painter> painter_;
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderPainter);
 };
 
-BorderPainter::BorderPainter(Painter* painter, const gfx::Insets& insets)
-    : painter_(painter),
-      insets_(insets) {
-  DCHECK(painter);
+BorderPainter::BorderPainter(std::unique_ptr<Painter> painter,
+                             const gfx::Insets& insets)
+    : painter_(std::move(painter)), insets_(insets) {
+  DCHECK(painter_);
 }
 
 void BorderPainter::Paint(const View& view, gfx::Canvas* canvas) {
   Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
 }
 
 gfx::Insets BorderPainter::GetInsets() const {
   return insets_;
 }
 
@@ skipping 45 matching lines @@
 std::unique_ptr<Border> Border::CreateSolidSidedBorder(int top,
                                                        int left,
                                                        int bottom,
                                                        int right,
                                                        SkColor color) {
   return base::WrapUnique(
       new SolidSidedBorder(gfx::Insets(top, left, bottom, right), color));
 }
 
 // static
-std::unique_ptr<Border> Border::CreateBorderPainter(Painter* painter,
-                                                    const gfx::Insets& insets) {
-  return base::WrapUnique(new BorderPainter(painter, insets));
+std::unique_ptr<Border> Border::CreateBorderPainter(
+    std::unique_ptr<Painter> painter,
+    const gfx::Insets& insets) {
+  return base::WrapUnique(new BorderPainter(std::move(painter), insets));
 }
 
 }  // namespace views