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

ui/views/border.h

 // 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.
 
 #ifndef UI_VIEWS_BORDER_H_
 #define UI_VIEWS_BORDER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 55 matching lines @@
                                                    int right);
 
   // Creates a border of the specified color, and specified thickness on each
   // side.
   static std::unique_ptr<Border> CreateSolidSidedBorder(int top,
                                                         int left,
                                                         int bottom,
                                                         int right,
                                                         SkColor color);
 
-  // Creates a Border from the specified Painter. The border owns the painter,
-  // thus the painter is deleted when the Border is deleted.
+  // Creates a Border from the specified Painter.
   // |insets| define size of an area allocated for a Border.
-  static std::unique_ptr<Border> CreateBorderPainter(Painter* painter,
-                                                     const gfx::Insets& insets);
+  static std::unique_ptr<Border> CreateBorderPainter(
+      std::unique_ptr<Painter> painter,
+      const gfx::Insets& insets);
 
   // Renders the border for the specified view.
   virtual void Paint(const View& view, gfx::Canvas* canvas) = 0;
 
   // Returns the border insets.
   virtual gfx::Insets GetInsets() const = 0;
 
   // Returns the minimum size this border requires.  Note that this may not be
   // the same as the insets.  For example, a Border may paint images to draw
   // some graphical border around a view, and this would return the minimum size
   // such that these images would not be clipped or overlapping -- but the
   // insets may be larger or smaller, depending on how the view wanted its
   // content laid out relative to these images.
   virtual gfx::Size GetMinimumSize() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Border);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BORDER_H_