Re-enable disabled tests in chrome/browser/ui/views/media_router/.

These pass on Windows.

This requires (mostly) reverting
https://chromium-review.googlesource.com/c/chromium/src/+/1005103 .
The revert is not perfect since many things changed since that CL
initially landed (e.g. various tests got disabled).

Bug: 658005, 678472, 817408, 828031, 843599, 849146, 863945
Change-Id: I23a3010be1faf962e0a2dfbaaa4a57a3e2cc89d3
Reviewed-on: https://chromium-review.googlesource.com/c/1351874Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619483}

chrome/browser/apps/platform_apps/app_window_interactive_uitest.cc

@@ -18,7 +18,6 @@
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
-#include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
 #endif
 
 #if defined(OS_WIN)

chrome/browser/devtools/devtools_sanity_interactive_browsertest.cc

@@ -147,14 +147,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalToMinimizedWindow) {
   CheckIsMinimized(true);
 }
 
-#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) {
+IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalToFullscreenWindow) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen faker;
 #endif
@@ -183,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
 }
 
 #if defined(OS_MACOSX)
-// https://crbug.com/828031
+// MacViews does not yet implement maximized windows: https://crbug.com/836327
 #define MAYBE_MaximizedToFullscreenWindow DISABLED_MaximizedToFullscreenWindow
 #else
 #define MAYBE_MaximizedToFullscreenWindow MaximizedToFullscreenWindow
@@ -193,14 +186,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
   browser()->window()->Maximize();
   CheckIsMaximized(true);
 
-#if defined(OS_MACOSX)
-  ui::test::ScopedFakeNSWindowFullscreen faker;
-#endif
   CheckIsFullscreen(false);
   SendCommand("fullscreen");
-#if defined(OS_MACOSX)
-  faker.FinishTransition();
-#endif
   CheckIsFullscreen(true);
 }
 
@@ -225,14 +212,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest,
   CheckIsMaximized(false);
 }
 
-#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) {
+IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, ExitFullscreenWindow) {
 #if defined(OS_MACOSX)
   ui::test::ScopedFakeNSWindowFullscreen faker;
 #endif

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

@@ -1035,6 +1035,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWindowCreateTest, MAYBE_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

@@ -580,6 +580,9 @@ 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();
@@ -662,6 +665,9 @@ 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

@@ -105,6 +105,13 @@ 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/keyboard_lock_interactive_browsertest.cc

@@ -18,6 +18,10 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/ui_base_features.h"
 
+#if defined(OS_MACOSX)
+#include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
+#endif
+
 namespace {
 
 // Javascript snippet used to verify the keyboard lock API exists.
@@ -103,6 +107,10 @@ class KeyboardLockInteractiveBrowserTest
   base::test::ScopedFeatureList scoped_feature_list_;
   net::EmbeddedTestServer https_test_server_;
 
+#if defined(OS_MACOSX)
+  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(KeyboardLockInteractiveBrowserTest);
 };
 

chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc

@@ -25,6 +25,10 @@
 #include "ui/aura/test/env_test_helper.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
+#endif
+
 using ZoomBubbleBrowserTest = InProcessBrowserTest;
 
 namespace {
@@ -42,6 +46,10 @@ void ShowInActiveTab(Browser* browser) {
 // Test whether the zoom bubble is anchored and whether it is visible when in
 // non-immersive fullscreen.
 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, NonImmersiveFullscreen) {
+#if defined(OS_MACOSX)
+  ui::test::ScopedFakeNSWindowFullscreen fake_fullscreen;
+#endif
+
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   content::WebContents* web_contents = browser_view->GetActiveWebContents();
 

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

@@ -145,13 +145,7 @@ class CastDialogViewTest : public ChromeViewsTestBase {
   CastDialogView* dialog_ = nullptr;
 };
 
-// Flaky on Mac. https://crbug.com/843599
-#if defined(OS_MACOSX)
-#define MAYBE_ShowAndHideDialog DISABLED_ShowAndHideDialog
-#else
-#define MAYBE_ShowAndHideDialog ShowAndHideDialog
-#endif
-TEST_F(CastDialogViewTest, MAYBE_ShowAndHideDialog) {
+TEST_F(CastDialogViewTest, ShowAndHideDialog) {
   EXPECT_FALSE(CastDialogView::IsShowing());
   EXPECT_EQ(nullptr, CastDialogView::GetCurrentDialogWidget());
 

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

@@ -270,15 +270,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest, OpenDialogFromContextMenu) {
   TestOpenDialogFromContextMenu();
 }
 
-// Disabled on macOS due to many timeouts. Seems fine on all other platforms.
-// crbug.com/849146
-#if defined(OS_MACOSX)
-#define MAYBE_OpenDialogFromAppMenu DISABLED_OpenDialogFromAppMenu
-#else
-#define MAYBE_OpenDialogFromAppMenu OpenDialogFromAppMenu
-#endif
-IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest,
-                       MAYBE_OpenDialogFromAppMenu) {
+IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest, OpenDialogFromAppMenu) {
   TestOpenDialogFromAppMenu();
 }
 
@@ -287,12 +279,8 @@ IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest,
   TestEphemeralToolbarIconForDialog();
 }
 
-// Flaky on chromeos, linux, win: https://crbug.com/658005
-// Flaky on MacViews: https://crbug.com/817408
-// TODO(https://crbug.com/678472): Replace this test case with a Views version.
-// Close out the bugs above when doing so.
 IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest,
-                       DISABLED_OpenDialogWithMediaRouterAction) {
+                       OpenDialogWithMediaRouterAction) {
   // We start off at about:blank page.
   // Make sure there is 1 tab and media router is enabled.
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
@@ -322,15 +310,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest,
   SetAlwaysShowActionPref(false);
 }
 
-#if defined(MEMORY_SANITIZER)
-// Flaky crashes. crbug.com/863945
-#define MAYBE_OpenDialogsInMultipleTabs DISABLED_OpenDialogsInMultipleTabs
-#else
-#define MAYBE_OpenDialogsInMultipleTabs OpenDialogsInMultipleTabs
-#endif
-
-IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest,
-                       MAYBE_OpenDialogsInMultipleTabs) {
+IN_PROC_BROWSER_TEST_F(MediaRouterWebUIBrowserTest, OpenDialogsInMultipleTabs) {
   // Start with two tabs.
   chrome::NewTab(browser());
   ASSERT_EQ(2, browser()->tab_strip_model()->count());

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

@@ -190,15 +190,8 @@ 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,
-                       MAYBE_LocationBarViewShown) {
+                       LocationBarViewShown) {
   receiver_view_->ShowInactiveFullscreen();
   receiver_view_->ExitFullscreen();
   ASSERT_FALSE(receiver_view_->IsFullscreen());
@@ -211,15 +204,8 @@ 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,
-                       MAYBE_ShowPageInfoDialog) {
+                       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,7 +22,6 @@
 
 #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 {
@@ -284,12 +283,6 @@ 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)

testing/buildbot/filters/mac_window_server_killers.browser_tests.filter

@@ -64,6 +64,7 @@
 -DeclarativeNetRequestBrowserTest.*
 -DeclarativeNetRequestHostPermissionsBrowserTest.*
 -DevToolsExtensionTest.*
+-DevToolsManagerDelegateTest.*
 -DevToolsSanityTest.*
 -DeviceManagementServiceIntegrationTestInstance/DeviceManagementServiceIntegrationTest.*
 -DiceBrowserTest.*
@@ -174,6 +175,7 @@
 -PrefsFunctionalTest.*
 -PrefsTabHelperBrowserTest.*
 -PrerenderBrowserTest.*
+-PresentationReceiverWindowViewBrowserTest.*
 -PrintBrowserTest.*
 -PrintPreviewDialogControllerBrowserTest.*
 -PrintPreviewSettingsSectionsTest.*