Just set borders once when creating a views::LabelButton

ui/views/controls/button/blue_button_unittest.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 "ui/views/controls/button/blue_button.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/button/label_button_border.h"
-#include "ui/views/test/views_test_base.h"
+#include "ui/views/test/widget_test.h"
 
 namespace views {
 
 namespace {
 
 class TestBlueButton : public BlueButton {

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

nit: TestBlueButton seems unnecessary, remove it?

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

Done (it's only used to promote OnNativeThemeChanged from protected to public,
but that's obsolete with the comment below).

  public:
   TestBlueButton() : BlueButton(NULL, base::ASCIIToUTF16("foo")) {}
   ~TestBlueButton() override {}
 
   using BlueButton::OnNativeThemeChanged;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestBlueButton);
 };
 
 }  // namespace
 
-typedef ViewsTestBase BlueButtonTest;
+using BlueButtonTest = test::WidgetTest;
 
 TEST_F(BlueButtonTest, Border) {
+  Widget* widget = CreateTopLevelPlatformWidget();
+
   // Compared to a normal LabelButton...
-  LabelButton button(NULL, base::ASCIIToUTF16("foo"));
-  button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), button.GetPreferredSize()));
-  gfx::Canvas button_canvas(button.bounds().size(), 1.0, true);
-  button.border()->Paint(button, &button_canvas);
+  LabelButton* button = new LabelButton(NULL, base::ASCIIToUTF16("foo"));
+

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

nit: remove blank line

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

Done.

+  // Add to a Widget to pick up a native theme.

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

nit: move this comment above the |widget| decl and say something like "The
buttons must be added to a widget to pick up a native theme."

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

Done.

+  widget->GetContentsView()->AddChildView(button);
+  button->SizeToPreferredSize();
+  gfx::Canvas button_canvas(button->size(), 1.0, true);
+  button->border()->Paint(*button, &button_canvas);
 
   // ... a special blue border should be used.
-  TestBlueButton blue_button;
-  blue_button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0),
-                            blue_button.GetPreferredSize()));
-  gfx::Canvas canvas(blue_button.bounds().size(), 1.0, true);
-  blue_button.border()->Paint(blue_button, &canvas);
-  EXPECT_EQ(button.GetText(), blue_button.GetText());
+  TestBlueButton* blue_button = new TestBlueButton();
+  widget->GetContentsView()->AddChildView(blue_button);
+  blue_button->SizeToPreferredSize();
+
+  gfx::Canvas canvas(blue_button->size(), 1.0, true);
+  blue_button->border()->Paint(*blue_button, &canvas);
+  EXPECT_EQ(button->GetText(), blue_button->GetText());
   EXPECT_FALSE(gfx::BitmapsAreEqual(button_canvas.ExtractImageRep().sk_bitmap(),

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

This test is somewhat ridiculous... it should at least check that the buttons
wind up being the same size before comparing their painted appearances.

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

You are right to accuse it :). The size actually didn't match because
BlueButtons are STYLE_BUTTON, but |button| is STYLE_TEXTBUTTON. (and
SetStyle(STYLE_BUTTON) does SetMinSize(70,33)).

So, I've added a SetStyle(STYLE_BUTTON) call to |button| for a more compelling
comparison.

Also added style and FocusPainter checks.

                                     canvas.ExtractImageRep().sk_bitmap()));
 
   // Make sure it's still used after the native theme "changes".

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

nit: maybe remove this second check now?

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

Done.

-  blue_button.OnNativeThemeChanged(NULL);
-  gfx::Canvas canvas2(blue_button.bounds().size(), 1.0, true);
-  blue_button.border()->Paint(blue_button, &canvas2);
+  blue_button->OnNativeThemeChanged(nullptr);
+  gfx::Canvas canvas2(blue_button->size(), 1.0, true);
+  blue_button->border()->Paint(*blue_button, &canvas2);
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(canvas.ExtractImageRep().sk_bitmap(),
                                    canvas2.ExtractImageRep().sk_bitmap()));
+
+  widget->CloseNow();
 }
 
 }  // namespace views