commit 8b4d0443029eee7cf94d6b818aace3e03b762bd6
author Samuel Tang <samtan@microsoft.com> Fri Jul 30 19:29:50 2021
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 30 19:29:50 2021
tree 92b69688240a191f87a1dba1986a152f7c88b436
parent dd973fe3c9a48f562cd4bca80410c597550a0214

dpwas: Re-enable StartupBrowserWebAppProtocolHandlingTest tests.

We removed support for win7 protocol handlers with this cl:
https://chromium-review.googlesource.com/c/chromium/src/+/3045481

Re-enabling the tests for windows platforms that are not win7.

Bug: 1233009
Change-Id: I17a8111450e751a8a0defe8e2998cbe914a6da60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3052646
Commit-Queue: Samuel Tang <samtan@microsoft.com>
Reviewed-by: Fabio Rocha <fabio.rocha@microsoft.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#907220}

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index 2ed51ba..3cfaf732 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -2164,6 +2164,14 @@
         blink::features::kWebAppEnableProtocolHandlers);
   }
 
+  bool AreProtocolHandlersSupported() {
+#if defined(OS_WIN)
+    return base::win::GetVersion() > base::win::Version::WIN7;
+#else
+    return true;
+#endif
+  }
+
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
   }
@@ -2217,17 +2225,12 @@
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
-// Flaky on Win7: crbug/1233009.
-#if defined(OS_WIN)
-#define MAYBE_WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel \
-  DISABLED_WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel
-#else
-#define MAYBE_WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel \
-  WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel
-#endif
 IN_PROC_BROWSER_TEST_F(
     StartupBrowserWebAppProtocolHandlingTest,
-    MAYBE_WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel) {
+    WebAppLaunch_WebAppIsNotLaunchedWithProtocolUrlAndDialogCancel) {
+  if (!AreProtocolHandlersSupported())
+    return;
+
   views::NamedWidgetShownWaiter waiter(views::test::AnyWidgetTestPasskey{},
                                        "WebAppProtocolHandlerIntentPickerView");
 
@@ -2249,17 +2252,12 @@
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
 }
 
-// Flaky on Win7: crbug/1233009.
-#if defined(OS_WIN)
-#define MAYBE_WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept \
-  DISABLED_WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept
-#else
-#define MAYBE_WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept \
-  WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept
-#endif
 IN_PROC_BROWSER_TEST_F(
     StartupBrowserWebAppProtocolHandlingTest,
-    MAYBE_WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept) {
+    WebAppLaunch_WebAppIsLaunchedWithProtocolUrlAndDialogAccept) {
+  if (!AreProtocolHandlersSupported())
+    return;
+
   views::NamedWidgetShownWaiter waiter(views::test::AnyWidgetTestPasskey{},
                                        "WebAppProtocolHandlerIntentPickerView");
 
@@ -2300,17 +2298,12 @@
             web_contents->GetVisibleURL());
 }
 
-// Flaky on Win7: crbug/1233009.
-#if defined(OS_WIN)
-#define MAYBE_WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl \
-  DISABLED_WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl
-#else
-#define MAYBE_WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl \
-  WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl
-#endif
 IN_PROC_BROWSER_TEST_F(
     StartupBrowserWebAppProtocolHandlingTest,
-    MAYBE_WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl) {
+    WebAppLaunch_WebAppIsNotTranslatedWithUnhandledProtocolUrl) {
+  if (!AreProtocolHandlersSupported())
+    return;
+
   // Register web app as a protocol handler that should *not* handle the launch.
   apps::ProtocolHandlerInfo protocol_handler;
   const std::string handler_url = std::string(kStartUrl) + "/testing=%s";
@@ -2338,19 +2331,15 @@
   EXPECT_EQ(GURL(kStartUrl), web_contents->GetVisibleURL());
 }
 
-// Flaky on Win7: crbug/1233009.
-#if defined(OS_WIN)
-#define MAYBE_WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref \
-  DISABLED_WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref
-#else
-#define MAYBE_WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref \
-  WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref
-#endif
 IN_PROC_BROWSER_TEST_F(
     StartupBrowserWebAppProtocolHandlingTest,
-    MAYBE_WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref) {
+    WebAppLaunch_WebAppIsLaunchedWithApprovedProtocolUrlPref) {
+  if (!AreProtocolHandlersSupported())
+    return;
+
   views::NamedWidgetShownWaiter waiter(views::test::AnyWidgetTestPasskey{},
                                        "WebAppProtocolHandlerIntentPickerView");
+
   // Register web app as a protocol handler that should handle the launch.
   apps::ProtocolHandlerInfo protocol_handler;
   const std::string handler_url = std::string(kStartUrl) + "/testing=%s";