Index: ui/views/controls/styled_label_unittest.cc |
diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc |
index 408212b385cfb68513b7ef29df9c089cc21eccb6..ee7d03762f69e713f2d113b902c91316157456e1 100644 |
--- a/ui/views/controls/styled_label_unittest.cc |
+++ b/ui/views/controls/styled_label_unittest.cc |
@@ -17,14 +17,14 @@ |
#include "ui/views/border.h" |
#include "ui/views/controls/link.h" |
#include "ui/views/controls/styled_label_listener.h" |
-#include "ui/views/test/views_test_base.h" |
+#include "ui/views/test/widget_test.h" |
#include "ui/views/widget/widget.h" |
using base::ASCIIToUTF16; |
namespace views { |
-class StyledLabelTest : public ViewsTestBase, public StyledLabelListener { |
+class StyledLabelTest : public test::WidgetTest, public StyledLabelListener { |
public: |
StyledLabelTest() {} |
~StyledLabelTest() override {} |
@@ -35,19 +35,35 @@ class StyledLabelTest : public ViewsTestBase, public StyledLabelListener { |
int event_flags) override {} |
protected: |
- StyledLabel* styled() { return styled_.get(); } |
+ StyledLabel* styled() { return styled_; } |
void InitStyledLabel(const std::string& ascii_text) { |
- styled_.reset(new StyledLabel(ASCIIToUTF16(ascii_text), this)); |
- styled_->set_owned_by_client(); |
+ styled_ = new StyledLabel(ASCIIToUTF16(ascii_text), this); |
+ widget_->GetContentsView()->RemoveAllChildViews(true); |
+ // Since Label::GetInsets() depends on IsFocusable(), add |styled_| to the |
+ // view hierarchy. |
+ widget_->GetContentsView()->AddChildView(styled_); |
} |
int StyledLabelContentHeightForWidth(int w) { |
return styled_->GetHeightForWidth(w) - styled_->GetInsets().height(); |
} |
+ void SetUp() override { |
+ test::WidgetTest::SetUp(); |
+ widget_ = CreateTopLevelFramelessPlatformWidget(); |
+ widget_->SetContentsView(new View); |
+ widget_->Show(); |
+ } |
+ |
+ void TearDown() override { |
+ widget_->CloseNow(); |
+ test::WidgetTest::TearDown(); |
+ } |
+ |
private: |
- std::unique_ptr<StyledLabel> styled_; |
+ Widget* widget_; |
+ StyledLabel* styled_; |
DISALLOW_COPY_AND_ASSIGN(StyledLabelTest); |
}; |