Just set borders once when creating a views::LabelButton

ui/views/controls/button/label_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 "ui/views/controls/button/label_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/text_utils.h"
-#include "ui/views/test/views_test_base.h"
+#include "ui/views/test/widget_test.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
 gfx::ImageSkia CreateTestImage(int width, int height) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(width, height);
   return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 }
 
 }  // namespace
 
 namespace views {
 
-typedef ViewsTestBase LabelButtonTest;
+class LabelButtonTest : public test::WidgetTest {
+ public:
+  LabelButtonTest() {}
+
+  // Make a test button and add it to the Widget to pick up borders (which could
+  // be derived from the Widget's NativeTheme).
+  LabelButton& MakeTestButton(const base::string16& text) {

[msw, 2015/07/10 18:35:50]

hmm, returning a non-const ref is a bit odd, why not a pointer?
Or maybe have SetUp create a button, tests can do button()->SetText, etc.

[tapted, 2015/07/13 07:41:22]

Heh, this was really just to make the diff less churny. Some of the tests are
for init flows, so I initially didn't want to do the creation in SetUp/TearDown,
but we can do the interesting init flow test without adding to a widget.

Done.

+    LabelButton* button = new LabelButton(nullptr, text);
+    test_widget_->GetContentsView()->AddChildView(button);
+    return *button;
+  }
+
+  // testing::Test:
+  void SetUp() override {
+    WidgetTest::SetUp();
+    test_widget_ = CreateTopLevelPlatformWidget();
+  }
+
+  void TearDown() override {
+    test_widget_->CloseNow();
+    WidgetTest::TearDown();
+  }
+
+ private:
+  Widget* test_widget_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(LabelButtonTest);
+};
 
 TEST_F(LabelButtonTest, Init) {
-  const base::string16 text(ASCIIToUTF16("abc"));
-  LabelButton button(NULL, text);
+  const base::string16& text = base::ASCIIToUTF16("abc");
+  LabelButton& button = MakeTestButton(text);
 
   EXPECT_TRUE(button.GetImage(Button::STATE_NORMAL).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_HOVERED).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_PRESSED).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_DISABLED).isNull());
 
   EXPECT_EQ(text, button.GetText());
   EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_FALSE(button.is_default());
   EXPECT_EQ(button.style(), Button::STYLE_TEXTBUTTON);
   EXPECT_EQ(Button::STATE_NORMAL, button.state());
 
   EXPECT_EQ(button.image_->parent(), &button);
   EXPECT_EQ(button.label_->parent(), &button);
 }
 
 TEST_F(LabelButtonTest, Label) {
-  LabelButton button(NULL, base::string16());
+  LabelButton& button = MakeTestButton(base::string16());
   EXPECT_TRUE(button.GetText().empty());
 
   const gfx::FontList font_list;
   const base::string16 short_text(ASCIIToUTF16("abcdefghijklm"));
   const base::string16 long_text(ASCIIToUTF16("abcdefghijklmnopqrstuvwxyz"));
   const int short_text_width = gfx::GetStringWidth(short_text, font_list);
   const int long_text_width = gfx::GetStringWidth(long_text, font_list);
 
   // The width increases monotonically with string size (it does not shrink).
   EXPECT_LT(button.GetPreferredSize().width(), short_text_width);
@@ skipping 10 matching lines @@
   button.SetMaxSize(gfx::Size(long_text_width, 1));
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(long_text_width, 1));
 
   // Clear the monotonically increasing minimum size.
   button.SetMinSize(gfx::Size());
   EXPECT_GT(button.GetPreferredSize().width(), short_text_width);
   EXPECT_LT(button.GetPreferredSize().width(), long_text_width);
 }
 
 TEST_F(LabelButtonTest, Image) {
-  LabelButton button(NULL, base::string16());
+  LabelButton& button = MakeTestButton(base::string16());
 
   const int small_size = 50, large_size = 100;
   const gfx::ImageSkia small_image = CreateTestImage(small_size, small_size);
   const gfx::ImageSkia large_image = CreateTestImage(large_size, large_size);
 
   // The width increases monotonically with image size (it does not shrink).
   EXPECT_LT(button.GetPreferredSize().width(), small_size);
   EXPECT_LT(button.GetPreferredSize().height(), small_size);
   button.SetImage(Button::STATE_NORMAL, small_image);
   EXPECT_GT(button.GetPreferredSize().width(), small_size);
@@ skipping 11 matching lines @@
   button.SetMaxSize(gfx::Size(large_size, 1));
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(large_size, 1));
 
   // Clear the monotonically increasing minimum size.
   button.SetMinSize(gfx::Size());
   EXPECT_GT(button.GetPreferredSize().width(), small_size);
   EXPECT_LT(button.GetPreferredSize().width(), large_size);
 }
 
 TEST_F(LabelButtonTest, LabelAndImage) {
-  LabelButton button(NULL, base::string16());
+  LabelButton& button = MakeTestButton(base::string16());
 
   const gfx::FontList font_list;
   const base::string16 text(ASCIIToUTF16("abcdefghijklm"));
   const int text_width = gfx::GetStringWidth(text, font_list);
 
   const int image_size = 50;
   const gfx::ImageSkia image = CreateTestImage(image_size, image_size);
   ASSERT_LT(font_list.GetHeight(), image_size);
 
   // The width increases monotonically with content size (it does not shrink).
@@ skipping 36 matching lines @@
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(image_size, 1));
 
   // Clear the monotonically increasing minimum size.
   button.SetMinSize(gfx::Size());
   EXPECT_LT(button.GetPreferredSize().width(), text_width);
   EXPECT_LT(button.GetPreferredSize().width(), image_size);
   EXPECT_LT(button.GetPreferredSize().height(), image_size);
 }
 
 TEST_F(LabelButtonTest, FontList) {
-  const base::string16 text(ASCIIToUTF16("abc"));
-  LabelButton button(NULL, text);
+  LabelButton& button = MakeTestButton(base::ASCIIToUTF16("abc"));
 
   const gfx::FontList original_font_list = button.GetFontList();
   const gfx::FontList large_font_list =
       original_font_list.DeriveWithSizeDelta(100);
   const int original_width = button.GetPreferredSize().width();
   const int original_height = button.GetPreferredSize().height();
 
   // The button size increases when the font size is increased.
   button.SetFontList(large_font_list);
   EXPECT_GT(button.GetPreferredSize().width(), original_width);
   EXPECT_GT(button.GetPreferredSize().height(), original_height);
 
   // The button returns to its original size when the minimal size is cleared
   // and the original font size is restored.
   button.SetMinSize(gfx::Size());
   button.SetFontList(original_font_list);
   EXPECT_EQ(original_width, button.GetPreferredSize().width());
   EXPECT_EQ(original_height, button.GetPreferredSize().height());
 }
 
 TEST_F(LabelButtonTest, ChangeTextSize) {
   const base::string16 text(ASCIIToUTF16("abc"));
   const base::string16 longer_text(ASCIIToUTF16("abcdefghijklm"));
-  LabelButton button(NULL, text);
+  LabelButton& button = MakeTestButton(text);
 
   const int original_width = button.GetPreferredSize().width();
 
   // The button size increases when the text size is increased.
   button.SetText(longer_text);
   EXPECT_GT(button.GetPreferredSize().width(), original_width);
 
   // The button returns to its original size when the original text is restored.
   button.SetMinSize(gfx::Size());
   button.SetText(text);
   EXPECT_EQ(original_width, button.GetPreferredSize().width());
 }
 
 TEST_F(LabelButtonTest, ChangeLabelImageSpacing) {
-  LabelButton button(NULL, ASCIIToUTF16("abc"));
+  LabelButton& button = MakeTestButton(base::ASCIIToUTF16("abc"));
   button.SetImage(Button::STATE_NORMAL, CreateTestImage(50, 50));
 
   const int kOriginalSpacing = 5;
   button.SetImageLabelSpacing(kOriginalSpacing);
   const int original_width = button.GetPreferredSize().width();
 
   // Increasing the spacing between the text and label should increase the size.
   button.SetImageLabelSpacing(2 * kOriginalSpacing);
   EXPECT_GT(button.GetPreferredSize().width(), original_width);
 
   // The button shrinks if the original spacing is restored.
   button.SetMinSize(gfx::Size());
   button.SetImageLabelSpacing(kOriginalSpacing);
   EXPECT_EQ(original_width, button.GetPreferredSize().width());
 }
 
 }  // namespace views