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

ui/views/controls/button/image_button_unittest.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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/test/views_test_base.h"
 
@@ skipping 98 matching lines @@
 
 TEST_F(ImageButtonTest, ImagePositionWithBorder) {
   ImageButton button(NULL);
   gfx::ImageSkia image = CreateTestImage(20, 30);
   button.SetImage(CustomButton::STATE_NORMAL, &image);
 
   // The image should be painted at the top-left corner.
   EXPECT_EQ(gfx::Point().ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 
-  button.set_border(views::Border::CreateEmptyBorder(10, 5, 0, 0));
+  button.SetBorder(views::Border::CreateEmptyBorder(10, 5, 0, 0));
   EXPECT_EQ(gfx::Point(5, 10).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 
-  button.set_border(NULL);
+  button.ClearBorder();
   button.SetBounds(0, 0, 50, 50);
   EXPECT_EQ(gfx::Point().ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 
   button.SetImageAlignment(ImageButton::ALIGN_CENTER,
                            ImageButton::ALIGN_MIDDLE);
   EXPECT_EQ(gfx::Point(15, 10).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
-  button.set_border(views::Border::CreateEmptyBorder(10, 10, 0, 0));
+  button.SetBorder(views::Border::CreateEmptyBorder(10, 10, 0, 0));
   EXPECT_EQ(gfx::Point(20, 15).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 }
 
 TEST_F(ImageButtonTest, LeftAlignedMirrored) {
   ImageButton button(NULL);
   gfx::ImageSkia image = CreateTestImage(20, 30);
   button.SetImage(CustomButton::STATE_NORMAL, &image);
   button.SetBounds(0, 0, 50, 30);
   button.SetImageAlignment(ImageButton::ALIGN_LEFT,
@@ skipping 15 matching lines @@
                            ImageButton::ALIGN_BOTTOM);
   button.SetDrawImageMirrored(true);
 
   // Because the coordinates are flipped, we should expect this to draw as if
   // it were ALIGN_LEFT.
   EXPECT_EQ(gfx::Point(0, 0).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 }
 
 }  // namespace views