mac: use ScopedFakeNSWindowFullscreen for all browser_tests

This is a debugging hack to try to narrow down the root cause of the linked
bug.

TBR=sky@chromium.org

Bug: 828031
Change-Id: Ibdfbd50cdc1bac1ec598f46efba5a63cb0475628
Reviewed-on: https://chromium-review.googlesource.com/1005103
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549698}

chrome/browser/apps/app_window_interactive_uitest.cc

@@ -76,10 +76,6 @@ void AppWindowInteractiveTest::WaitUntilKeyFocus() {
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenWindow) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
-
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("leave_fullscreen", &launched_listener);
 
@@ -117,10 +113,6 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenWindow) {
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
-
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("leave_fullscreen", &launched_listener);
 
@@ -166,10 +158,6 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, ESCLeavesFullscreenDOM) {
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
                        ESCDoesNotLeaveFullscreenWindow) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
-
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("prevent_leave_fullscreen", &launched_listener);
 
@@ -212,10 +200,6 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
 
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
                        ESCDoesNotLeaveFullscreenDOM) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
-
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("prevent_leave_fullscreen", &launched_listener);
 
@@ -268,10 +252,6 @@ IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
 // and 'overrideEscFullscreen'.
 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest,
                        ESCDoesNotLeaveFullscreenOldPermission) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
-
   ExtensionTestMessageListener launched_listener("Launched", true);
   LoadAndLaunchPlatformApp("prevent_leave_fullscreen_old", &launched_listener);
 

chrome/browser/devtools/devtools_sanity_interactive_browsertest.cc

@@ -140,7 +140,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalToMinimizedWindow) {
   CheckIsMinimized(true);
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalToFullscreenWindow) {
+#if defined(OS_MACOSX)
+// https://crbug.com/828031
+#define MAYBE_NormalToFullscreenWindow DISABLED_NormalToFullscreenWindow
+#else
+#define MAYBE_NormalToFullscreenWindow NormalToFullscreenWindow
+#endif
+IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
+                       MAYBE_NormalToFullscreenWindow) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen faker;
 #endif
@@ -162,8 +169,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
   CheckIsMinimized(true);
 }
 
+#if defined(OS_MACOSX)
+// https://crbug.com/828031
+#define MAYBE_MaximizedToFullscreenWindow DISABLED_MaximizedToFullscreenWindow
+#else
+#define MAYBE_MaximizedToFullscreenWindow MaximizedToFullscreenWindow
+#endif
 IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
-                       MaximizedToFullscreenWindow) {
+                       MAYBE_MaximizedToFullscreenWindow) {
   browser()->window()->Maximize();
   CheckIsMaximized(true);
 
@@ -192,7 +205,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, RestoreMaximizedWindow) {
   CheckIsMaximized(false);
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, ExitFullscreenWindow) {
+#if defined(OS_MACOSX)
+// https://crbug.com/828031
+#define MAYBE_ExitFullscreenWindow DISABLED_ExitFullscreenWindow
+#else
+#define MAYBE_ExitFullscreenWindow ExitFullscreenWindow
+#endif
+IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
+                       MAYBE_ExitFullscreenWindow) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen faker;
 #endif

chrome/browser/extensions/api/tabs/tabs_test.cc

@@ -1051,7 +1051,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, AcceptState) {
 #if defined(OS_MACOSX)
   if (base::mac::IsOS10_10())
     return;  // Fails when swarmed. http://crbug.com/660582
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
 #endif
 
   scoped_refptr<WindowsCreateFunction> function(new WindowsCreateFunction());

chrome/browser/notifications/notification_interactive_uitest.cc

@@ -595,9 +595,6 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestShouldDisplayNormal) {
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestShouldDisplayFullscreen) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
   ASSERT_TRUE(embedded_test_server()->Start());
 
   AllowAllOrigins();
@@ -680,9 +677,6 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestShouldDisplayMultiFullscreen) {
 // Verify that a notification is actually displayed when the webpage that
 // creates it is fullscreen with the fullscreen notification flag turned on.
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestShouldDisplayPopupNotification) {
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
-#endif
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Creates a simple notification.

chrome/browser/ui/exclusive_access/fullscreen_controller_test.h

@@ -93,13 +93,6 @@ class FullscreenControllerTest : public InProcessBrowserTest {
   void ToggleTabFullscreen_Internal(bool enter_fullscreen,
                                     bool retry_until_success);
 
-#if defined(OS_MACOSX)
-  // On Mac, entering into the system fullscreen mode can tickle crashes in
-  // the WindowServer (c.f. https://crbug.com/828031), so provide a fake for
-  // testing.
-  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen_window_;
-#endif
-
   base::test::ScopedFeatureList scoped_feature_list_;
 
   base::WeakPtrFactory<FullscreenControllerTest> weak_ptr_factory_;

chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc

@@ -218,8 +218,15 @@ IN_PROC_BROWSER_TEST_F(PresentationReceiverWindowViewBrowserTest,
 }
 #endif
 
+#if defined(OS_MACOSX)
+// https://crbug.com/828031
+#define MAYBE_LocationBarViewShown DISABLED_LocationBarViewShown
+#else
+#define MAYBE_LocationBarViewShown LocationBarViewShown
+#endif
+
 IN_PROC_BROWSER_TEST_F(PresentationReceiverWindowViewBrowserTest,
-                       LocationBarViewShown) {
+                       MAYBE_LocationBarViewShown) {
   static_cast<PresentationReceiverWindow*>(receiver_view_)
       ->ShowInactiveFullscreen();
   static_cast<ExclusiveAccessContext*>(receiver_view_)->ExitFullscreen();
@@ -234,8 +241,15 @@ IN_PROC_BROWSER_TEST_F(PresentationReceiverWindowViewBrowserTest,
   EXPECT_LT(0, location_bar_view->height());
 }
 
+#if defined(OS_MACOSX)
+// https://crbug.com/828031
+#define MAYBE_ShowPageInfoDialog DISABLED_ShowPageInfoDialog
+#else
+#define MAYBE_ShowPageInfoDialog ShowPageInfoDialog
+#endif
+
 IN_PROC_BROWSER_TEST_F(PresentationReceiverWindowViewBrowserTest,
-                       ShowPageInfoDialog) {
+                       MAYBE_ShowPageInfoDialog) {
   content::NavigationController::LoadURLParams load_params(GURL("about:blank"));
   fake_delegate_->web_contents()->GetController().LoadURLWithParams(
       load_params);

chrome/test/base/in_process_browser_test.h

@@ -22,6 +22,7 @@
 
 #if defined(OS_MACOSX)
 #include "ui/base/test/scoped_fake_full_keyboard_access.h"
+#include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
 #endif
 
 namespace base {
@@ -270,6 +271,12 @@ class InProcessBrowserTest : public content::BrowserTestBase {
   // more consistent with other platforms, where most views are focusable by
   // default.
   ui::test::ScopedFakeFullKeyboardAccess faked_full_keyboard_access_;
+
+  // Don't allow browser tests to enter real fullscreen - it might trigger races
+  // in WindowServer in test configurations. This is a temporary debugging hack.
+  // TODO(ellyjones): Remove this or make it permanent -
+  // https://crbug.com/828031.
+  ui::test::ScopedFakeNSWindowFullscreen faked_fullscreen_;
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)