Index: ui/views/controls/button/blue_button_unittest.cc |
diff --git a/ui/views/controls/button/blue_button_unittest.cc b/ui/views/controls/button/blue_button_unittest.cc |
index d2f92a3e4a1cfaf916787122ba8e077f22a42082..881ec649d2352175683ecb3c5938bc0418ca7619 100644 |
--- a/ui/views/controls/button/blue_button_unittest.cc |
+++ b/ui/views/controls/button/blue_button_unittest.cc |
@@ -13,32 +13,18 @@ |
namespace views { |
-namespace { |
- |
-class TestBlueButton : public BlueButton { |
- public: |
- TestBlueButton() : BlueButton(NULL, base::ASCIIToUTF16("foo")) {} |
- ~TestBlueButton() override {} |
- |
- using BlueButton::OnNativeThemeChanged; |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(TestBlueButton); |
-}; |
- |
-} // namespace |
- |
typedef ViewsTestBase BlueButtonTest; |
TEST_F(BlueButtonTest, Border) { |
// Compared to a normal LabelButton... |
- LabelButton button(NULL, base::ASCIIToUTF16("foo")); |
+ LabelButton button(nullptr); |
+ button.InitAsTextbutton(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); |
// ... a special blue border should be used. |
- TestBlueButton blue_button; |
+ BlueButton blue_button(nullptr, base::ASCIIToUTF16("foo")); |
blue_button.SetBoundsRect(gfx::Rect(gfx::Point(0, 0), |
blue_button.GetPreferredSize())); |
gfx::Canvas canvas(blue_button.bounds().size(), 1.0, true); |