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

ash/system/tray/tray_background_view.cc

Index: ash/system/tray/tray_background_view.cc
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 765b2a26f93efd7802c7471fe6d118efdb40cea2..1515e4d2ac98b0017183c0d136ae35799c25c0fe 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -284,11 +284,10 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
       vertical_padding = kPaddingFromEdgeOfShelf;
       horizontal_padding = kPaddingFromEdgeOfShelf;
     }
-    set_border(views::Border::CreateEmptyBorder(
-        vertical_padding,
-        horizontal_padding,
-        vertical_padding,
-        horizontal_padding));
+    SetBorder(views::Border::CreateEmptyBorder(vertical_padding,
+                                               horizontal_padding,
+                                               vertical_padding,
+                                               horizontal_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
@@ -301,11 +300,10 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
       vertical_padding = kPaddingFromEdgeOfShelf;
       horizontal_padding = kPaddingFromEdgeOfShelf;
     }
-    set_border(views::Border::CreateEmptyBorder(
-        vertical_padding,
-        horizontal_padding,
-        vertical_padding,
-        horizontal_padding));
+    SetBorder(views::Border::CreateEmptyBorder(vertical_padding,
+                                               horizontal_padding,
+                                               vertical_padding,
+                                               horizontal_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
@@ -350,7 +348,7 @@ TrayBackgroundView::~TrayBackgroundView() {
 
 void TrayBackgroundView::Initialize() {
   GetWidget()->AddObserver(widget_observer_.get());
-  SetBorder();
+  SetTrayBorder();
 }
 
 const char* TrayBackgroundView::GetClassName() const {
@@ -434,11 +432,11 @@ ShelfLayoutManager* TrayBackgroundView::GetShelfLayoutManager() {
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
-  SetBorder();
+  SetTrayBorder();
   tray_container_->SetAlignment(alignment);
 }
 
-void TrayBackgroundView::SetBorder() {
+void TrayBackgroundView::SetTrayBorder() {
   views::View* parent = status_area_widget_->status_area_widget_delegate();
   // Tray views are laid out right-to-left or bottom-to-top
   bool on_edge = (this == parent->child_at(0));
@@ -489,7 +487,7 @@ void TrayBackgroundView::SetBorder() {
       right_edge = kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
     }
   }
-  set_border(views::Border::CreateEmptyBorder(
+  SetBorder(views::Border::CreateEmptyBorder(
       top_edge, left_edge, bottom_edge, right_edge));
 }