Fix NativeWidgetMacTest.HideAndShowExternally

ui/views/widget/native_widget_mac_unittest.mm

 // Copyright 2014 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.
 
 #import "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/run_loop.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/widget_test.h"
 
 namespace views {
 namespace test {
 
 // Tests for parts of NativeWidgetMac not covered by BridgedNativeWidget, which
 // need access to Cocoa APIs.
 typedef WidgetTest NativeWidgetMacTest;
 
@@ skipping 59 matching lines @@
 
   [ns_window orderFront:nil];
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_TRUE([ns_window isVisible]);
   EXPECT_EQ(3, observer.gained_visible_count());
   EXPECT_EQ(2, observer.lost_visible_count());
 
   // Test when hiding the entire application. This doesn't send an orderOut:
   // to the NSWindow.
   [NSApp hide:nil];
+  // When the activation policy is NSApplicationActivationPolicyRegular, the
+  // calls via NSApp are asynchronous, and the run loop needs to be flushed.
+  // With NSApplicationActivationPolicyProhibited, the following RunUntilIdle
+  // calls are superfluous, but don't hurt.
+  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(widget->IsVisible());
   EXPECT_FALSE([ns_window isVisible]);
   EXPECT_EQ(3, observer.gained_visible_count());
   EXPECT_EQ(3, observer.lost_visible_count());
 
   [NSApp unhideWithoutActivation];
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_TRUE([ns_window isVisible]);
   EXPECT_EQ(4, observer.gained_visible_count());
   EXPECT_EQ(3, observer.lost_visible_count());
 
   // Hide again to test unhiding with an activation.
   [NSApp hide:nil];
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(4, observer.lost_visible_count());
   [NSApp unhide:nil];
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(5, observer.gained_visible_count());
 
+  // Hide again to test makeKeyAndOrderFront:.
+  [ns_window orderOut:nil];
+  EXPECT_FALSE(widget->IsVisible());
+  EXPECT_FALSE([ns_window isVisible]);
+  EXPECT_EQ(5, observer.gained_visible_count());
+  EXPECT_EQ(5, observer.lost_visible_count());
+
+  [ns_window makeKeyAndOrderFront:nil];
+  EXPECT_TRUE(widget->IsVisible());
+  EXPECT_TRUE([ns_window isVisible]);
+  EXPECT_EQ(6, observer.gained_visible_count());
+  EXPECT_EQ(5, observer.lost_visible_count());
+
   // No change when closing.
   widget->CloseNow();
-  EXPECT_EQ(4, observer.lost_visible_count());
-  EXPECT_EQ(5, observer.gained_visible_count());
+  EXPECT_EQ(5, observer.lost_visible_count());
+  EXPECT_EQ(6, observer.gained_visible_count());
 }
 
 // A view that counts calls to OnPaint().
 class PaintCountView : public View {
  public:
   PaintCountView() : paint_count_(0) {
     SetBounds(0, 0, 100, 100);
   }
 
   // View:
@@ skipping 111 matching lines @@
   // But this should work.
   widget->Minimize();
   EXPECT_TRUE(widget->IsMinimized());
 
   // Test closing while minimized.
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views