MacViews: Fix views_unittests BubbleDelegateTest.CloseReasons

ui/views/bubble/bubble_delegate_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/macros.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(OS_MACOSX)
+#include "ui/base/test/scoped_fake_nswindow_focus.h"
+#endif
+
 namespace views {
 
 namespace {
 
 class TestBubbleDelegateView : public BubbleDelegateView {
  public:
   TestBubbleDelegateView(View* anchor_view)
       : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
         view_(new View()) {
     view_->SetFocusable(true);
@@ skipping 31 matching lines @@
   // Creates a test widget that owns its native widget.
   Widget* CreateTestWidget() {
     Widget* widget = new Widget();
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget->Init(params);
     return widget;
   }
 
  private:
+#if defined(OS_MACOSX)
+  ui::test::ScopedFakeNSWindowFocus fake_focus;

[tapted, 2016/03/03 23:34:50]

oops - this should have an underscore on the end. We should probably be
consistent with the comment about this too, like

// Ensure tests running in parallel don't steal focus from the Widget on Mac.

[Patti Lor, 2016/03/04 06:27:11]

Done.

+#endif
+
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateTest);
 };
 
 }  // namespace
 
 TEST_F(BubbleDelegateTest, CreateDelegate) {
   scoped_ptr<Widget> anchor_widget(CreateTestWidget());
   BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
       anchor_widget->GetContentsView(), BubbleBorder::NONE);
   bubble_delegate->set_color(SK_ColorGREEN);
@@ skipping 192 matching lines @@
 }
 
 TEST_F(BubbleDelegateTest, CloseReasons) {
   {
     scoped_ptr<Widget> anchor_widget(CreateTestWidget());
     BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
         anchor_widget->GetContentsView(), BubbleBorder::NONE);
     bubble_delegate->set_close_on_deactivate(true);
     Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate);
     bubble_widget->Show();
+    EXPECT_FALSE(anchor_widget->IsVisible());

[msw, 2016/03/04 00:23:58]

Why don't we just show |anchor_widget| earlier in this test to simplify the
expected behavior? You can add a separate test fixture dedicated to
demonstrating the defective behavior on aura.

[Patti Lor, 2016/03/04 06:27:11]

Done, will add another test fixture for the Aura bug in a separate CL :)

+#if !defined(USE_AURA)
+    // Bubbles are top-level which, on Aura, causes the parent->child
+    // relationship to be managed by wm::TransientWindowManager rather than the
+    // ui::Layer hierarchy. TransientWindowManager currently permits a child to
+    // be shown when its parent is hidden, but it shouldn't.
+    // This is http://crbug.com/590957.
+    EXPECT_FALSE(bubble_widget->IsVisible());
+    anchor_widget->Show();
+    bubble_widget->Activate();
+#endif
+    EXPECT_TRUE(bubble_widget->IsVisible());
+    EXPECT_TRUE(bubble_widget->IsActive());
     anchor_widget->Activate();
     EXPECT_TRUE(bubble_widget->IsClosed());
     EXPECT_EQ(BubbleDelegateView::CloseReason::DEACTIVATION,
               bubble_delegate->close_reason());
   }
 
   {
     scoped_ptr<Widget> anchor_widget(CreateTestWidget());
     BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
         anchor_widget->GetContentsView(), BubbleBorder::NONE);
@@ skipping 22 matching lines @@
         close_button,
         ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
                        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
     EXPECT_TRUE(bubble_widget->IsClosed());
     EXPECT_EQ(BubbleDelegateView::CloseReason::CLOSE_BUTTON,
               bubble_delegate->close_reason());
   }
 }
 
 }  // namespace views