Just set borders once when creating a views::LabelButton

chrome/test/base/view_event_test_base.cc

Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 1262582f693ef0b0d96d3ac9ebfd9a8ef8ec9562..8978f12ab95bb5e7621369103c4fbfdab0fff591 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -23,17 +23,10 @@ namespace {
 // View subclass that allows you to specify the preferred size.
 class TestView : public views::View {
  public:
-  TestView() {}
-
-  void SetPreferredSize(const gfx::Size& size) {
-    preferred_size_ = size;
-    PreferredSizeChanged();
-  }
+  explicit TestView(ViewEventTestBase* harness) : harness_(harness) {}
 
   gfx::Size GetPreferredSize() const override {
-    if (!preferred_size_.IsEmpty())
-      return preferred_size_;
-    return View::GetPreferredSize();
+    return harness_->GetPreferredSize();
   }
 
   void Layout() override {
@@ -42,7 +35,7 @@ class TestView : public views::View {
   }
 
  private:
-  gfx::Size preferred_size_;
+  ViewEventTestBase* harness_;
 
   DISALLOW_COPY_AND_ASSIGN(TestView);
 };
@@ -100,6 +93,10 @@ void ViewEventTestBase::TearDown() {
   ui::ShutdownInputMethodForTesting();
 }
 
+gfx::Size ViewEventTestBase::GetPreferredSize() const {
+  return gfx::Size();
+}
+
 bool ViewEventTestBase::CanResize() const {
   return true;
 }
@@ -108,8 +105,7 @@ views::View* ViewEventTestBase::GetContentsView() {
   if (!content_view_) {
     // Wrap the real view (as returned by CreateContentsView) in a View so
     // that we can customize the preferred size.
-    TestView* test_view = new TestView();
-    test_view->SetPreferredSize(GetPreferredSize());
+    TestView* test_view = new TestView(this);
     test_view->AddChildView(CreateContentsView());
     content_view_ = test_view;
   }
@@ -143,10 +139,6 @@ void ViewEventTestBase::StartMessageLoopAndRunTest() {
   content::RunThisRunLoop(&run_loop_);
 }
 
-gfx::Size ViewEventTestBase::GetPreferredSize() const {
-  return gfx::Size();
-}
-
 void ViewEventTestBase::ScheduleMouseMoveInBackground(int x, int y) {
   if (!dnd_thread_.get()) {
     dnd_thread_.reset(new base::Thread("mouse-move-thread"));