views: Make View::set_border() take a scoped_ptr<>.

chrome/browser/ui/libgtk2ui/gtk2_border.cc

 // Copyright 2014 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 "chrome/browser/ui/libgtk2ui/gtk2_border.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "ui/gfx/canvas.h"
@@ skipping 32 matching lines @@
 
   virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
     int w = size_.width() * scale;
     int h = size_.height() * scale;
     return gfx::ImageSkiaRep(
         gtk2_ui_->DrawGtkButtonBorder(state_, w, h), scale);
   }
 
  private:
   const Gtk2UI* gtk2_ui_;
-  GtkStateType state_;
-  gfx::Size size_;
+  const GtkStateType state_;
+  const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
 };
 
 }  // namespace
 
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
                        views::CustomButton* owning_button,
-                       views::Border* border)
+                       scoped_ptr<views::Border> border)
     : gtk2_ui_(gtk2_ui),
       use_gtk_(gtk2_ui_->GetUseSystemTheme()),
       owning_button_(owning_button),
-      border_(border) {
+      border_(border.Pass()) {
   gtk2_ui_->AddGtkBorder(this);
 }
 
 Gtk2Border::~Gtk2Border() {
   gtk2_ui_->RemoveGtkBorder(this);
 }
 
 void Gtk2Border::InvalidateAndSetUsesGtk(bool use_gtk) {
   hovered_ = gfx::ImageSkia();
   pressed_ = gfx::ImageSkia();
@@ skipping 40 matching lines @@
 
 gfx::Size Gtk2Border::GetMinimumSize() const {
   if (!use_gtk_)
     return border_->GetMinimumSize();
 
   gfx::Insets insets = GetInsets();
   return gfx::Size(insets.width(), insets.height());
 }
 
 }  // namespace libgtk2ui