Fix for black-hole.

views/widget/widget_unittest.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_views.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 114 matching lines @@
 Widget* CreateChildPlatformWidget(gfx::NativeView parent_native_view) {
   Widget* child = new Widget;
   Widget::InitParams child_params(Widget::InitParams::TYPE_CONTROL);
   child_params.native_widget = CreatePlatformNativeWidget(child);
   child_params.parent = parent_native_view;
   child->Init(child_params);
   child->SetContentsView(new View);
   return child;
 }
 
+Widget* CreateTopLevelNativeWidgetViews() {
+  Widget* toplevel = new Widget;
+  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
+  params.native_widget = new NativeWidgetViews(toplevel);
+  toplevel->Init(params);
+  toplevel->SetContentsView(new View);
+  return toplevel;
+}
+
 Widget* CreateChildNativeWidgetViewsWithParent(Widget* parent) {
   Widget* child = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
   params.native_widget = new NativeWidgetViews(child);
   params.parent_widget = parent;
   child->Init(params);
   child->SetContentsView(new View);
   return child;
 }
 
@@ skipping 26 matching lines @@
 
   toplevel->CloseNow();
   // |child| should be automatically destroyed with |toplevel|.
 }
 
 TEST_F(WidgetTest, GetTopLevelWidget_Synthetic) {
   // Create a hierarchy consisting of a top level platform native widget and a
   // child NativeWidgetViews.
   Widget* toplevel = CreateTopLevelPlatformWidget();
   widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
-  Widget* child = CreateChildNativeWidgetViews();
+  Widget* child = CreateTopLevelNativeWidgetViews();
 
   EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
   EXPECT_EQ(child, child->GetTopLevelWidget());
 
   toplevel->CloseNow();
   // |child| should be automatically destroyed with |toplevel|.
 }
 
-// Creates a hierarchy consisting of a top level platform native widget, a child
-// NativeWidgetViews, and a child of that child, another NativeWidgetViews.
-TEST_F(WidgetTest, GetTopLevelWidget_SyntheticParent) {
-  Widget* toplevel = CreateTopLevelPlatformWidget();
-  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
+// Creates a hierarchy consisting of a desktop platform native widget, a
+// toplevel NativeWidgetViews, and a child of that toplevel, another
+// NativeWidgetViews.
+TEST_F(WidgetTest, GetTopLevelWidget_SyntheticDesktop) {
+  // Create a hierarchy consisting of a desktop platform native widget,
+  // a toplevel NativeWidgetViews and a chlid NativeWidgetViews.
+  Widget* desktop = CreateTopLevelPlatformWidget();
+  widget_views_delegate().set_default_parent_view(desktop->GetRootView());
+  Widget* toplevel = CreateTopLevelNativeWidgetViews(); // Will be parented
+                                                        // automatically to
+                                                        // |toplevel|.
 
-  Widget* child1 = CreateChildNativeWidgetViews(); // Will be parented
-                                                   // automatically to
-                                                   // |toplevel|.
-  Widget* child11 = CreateChildNativeWidgetViewsWithParent(child1);
+  Widget* child = CreateChildNativeWidgetViewsWithParent(toplevel);
 
+  EXPECT_EQ(desktop, desktop->GetTopLevelWidget());
   EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
-  EXPECT_EQ(child1, child1->GetTopLevelWidget());
-  EXPECT_EQ(child1, child11->GetTopLevelWidget());
+  EXPECT_EQ(toplevel, child->GetTopLevelWidget());
 
-  toplevel->CloseNow();
-  // |child1| and |child11| should be destroyed with |toplevel|.
+  desktop->CloseNow();
+  // |toplevel|, |child| should be automatically destroyed with |toplevel|.
 }
 
 // This is flaky on touch build. See crbug.com/94137.
 #if defined(TOUCH_UI)
 #define MAYBE_GrabUngrab DISABLED_GrabUngrab
 #else
 #define MAYBE_GrabUngrab GrabUngrab
 #endif
 // Tests some grab/ungrab events.
 TEST_F(WidgetTest, MAYBE_GrabUngrab) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
-
-  Widget* child1 = CreateChildNativeWidgetViews(); // Will be parented
-                                                   // automatically to
-                                                   // |toplevel|.
-  Widget* child2 = CreateChildNativeWidgetViews();
+  Widget* child1 = CreateChildNativeWidgetViewsWithParent(toplevel);
+  Widget* child2 = CreateChildNativeWidgetViewsWithParent(toplevel);
 
   toplevel->SetBounds(gfx::Rect(0, 0, 500, 500));
 
   child1->SetBounds(gfx::Rect(10, 10, 300, 300));
   View* view = new MouseView();
   view->SetBounds(0, 0, 300, 300);
   child1->GetRootView()->AddChildView(view);
 
   child2->SetBounds(gfx::Rect(200, 10, 200, 200));
   view = new MouseView();
@@ skipping 409 matching lines @@
   void reset() {
     active_ = NULL;
     widget_closed_ = NULL;
     widget_activated_ = NULL;
     widget_deactivated_ = NULL;
     widget_shown_ = NULL;
     widget_hidden_ = NULL;
   }
 
   Widget* NewWidget() {
-    Widget* widget = CreateChildNativeWidgetViews();
+    Widget* widget = CreateTopLevelNativeWidgetViews();
     widget->AddObserver(this);
     return widget;
   }
 
   const Widget* active() const { return active_; }
   const Widget* widget_closed() const { return widget_closed_; }
   const Widget* widget_activated() const { return widget_activated_; }
   const Widget* widget_deactivated() const { return widget_deactivated_; }
   const Widget* widget_shown() const { return widget_shown_; }
   const Widget* widget_hidden() const { return widget_hidden_; }
 
  private:
 
   Widget* active_;
 
   Widget* widget_closed_;
   Widget* widget_activated_;
   Widget* widget_deactivated_;
   Widget* widget_shown_;
   Widget* widget_hidden_;
 };
 
 TEST_F(WidgetObserverTest, ActivationChange) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
   widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
-  Widget* child1 = NewWidget();
-  Widget* child2 = NewWidget();
+  Widget* toplevel1 = NewWidget();
+  Widget* toplevel2 = NewWidget();
+
+  toplevel1->Show();
+  toplevel2->Show();
 
   reset();
 
-  child1->Activate();
-  EXPECT_EQ(child1, widget_activated());
+  toplevel1->Activate();
 
-  child2->Activate();
-  EXPECT_EQ(child1, widget_deactivated());
-  EXPECT_EQ(child2, widget_activated());
-  EXPECT_EQ(child2, active());
+  RunPendingMessages();
+  EXPECT_EQ(toplevel1, widget_activated());
+
+  toplevel2->Activate();
+  RunPendingMessages();
+  EXPECT_EQ(toplevel1, widget_deactivated());
+  EXPECT_EQ(toplevel2, widget_activated());
+  EXPECT_EQ(toplevel2, active());
+
+  toplevel->CloseNow();
 }
 
 TEST_F(WidgetObserverTest, VisibilityChange) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
   widget_views_delegate().set_default_parent_view(toplevel->GetRootView());
 
   Widget* child1 = NewWidget();
   Widget* child2 = NewWidget();
 
   reset();
 
   child1->Hide();
   EXPECT_EQ(child1, widget_hidden());
 
   child2->Hide();
   EXPECT_EQ(child2, widget_hidden());
 
   child1->Show();
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
+
+  toplevel->CloseNow();
 }
 
 }  // namespace
 }  // namespace views