| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index eb25225836917c55bde0ec92e55c9b367f839c6a..3591781bf15a63a4578cbe93c1ecd2f20150733c 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -1683,46 +1683,6 @@ TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
|
| }
|
| #endif // !OS_CHROMEOS
|
|
|
| -// Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
|
| -class VerifyTopLevelDelegate : public TestViewsDelegate {
|
| - public:
|
| - VerifyTopLevelDelegate()
|
| - : on_before_init_called_(false),
|
| - is_top_level_(false) {
|
| - }
|
| -
|
| - bool on_before_init_called() const { return on_before_init_called_; }
|
| - bool is_top_level() const { return is_top_level_; }
|
| -
|
| - virtual void OnBeforeWidgetInit(
|
| - Widget::InitParams* params,
|
| - internal::NativeWidgetDelegate* delegate) OVERRIDE {
|
| - on_before_init_called_ = true;
|
| - is_top_level_ = params->top_level;
|
| - }
|
| -
|
| - private:
|
| - bool on_before_init_called_;
|
| - bool is_top_level_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(VerifyTopLevelDelegate);
|
| -};
|
| -
|
| -// Verifies |top_level| is correctly passed to
|
| -// ViewsDelegate::OnBeforeWidgetInit().
|
| -TEST_F(WidgetTest, SetTopLevelCorrectly) {
|
| - set_views_delegate(NULL);
|
| - VerifyTopLevelDelegate* delegate = new VerifyTopLevelDelegate;
|
| - set_views_delegate(delegate); // ViewsTestBase takes ownership.
|
| - scoped_ptr<Widget> widget(new Widget);
|
| - Widget::InitParams params =
|
| - CreateParams(views::Widget::InitParams::TYPE_POPUP);
|
| - params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| - widget->Init(params);
|
| - EXPECT_TRUE(delegate->on_before_init_called());
|
| - EXPECT_TRUE(delegate->is_top_level());
|
| -}
|
| -
|
| TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) {
|
| Widget* widget = new Widget;
|
| Widget::InitParams params =
|
|
|