From 457296b45453d49d46e495701347d7c56bfe2db5 Mon Sep 17 00:00:00 2001 From: Kristi Park Date: Thu, 7 Apr 2022 17:38:27 +0000 Subject: [PATCH] Revert "[dpwa] Re-enable the web app file handler tests." This reverts commit fc8ad759f35d659d9fcc5bbf30b12c1432eba2e9. Reason for revert: Test still failing (https://ci.chromium.org/ui/p/chromium/builders/ci/mac11-arm64-rel-tests/5409/) Original change's description: > [dpwa] Re-enable the web app file handler tests. > > Bug: 1270961 > Change-Id: Ie6335b64f1d56634d2da67d93bb36659fdacb0fb > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3572598 > Reviewed-by: Daniel Murphy > Commit-Queue: Daniel Murphy > Cr-Commit-Position: refs/heads/main@{#989511} Bug: 1270961 Change-Id: I6d6b7d6234c01803d0dc0bbadc88078be9eb797c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3575285 Owners-Override: Kristi Park Bot-Commit: Rubber Stamper Auto-Submit: Kristi Park Commit-Queue: Kristi Park Cr-Commit-Position: refs/heads/main@{#989997} --- chrome/browser/ui/web_applications/web_app_browsertest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/browser/ui/web_applications/web_app_browsertest.cc b/chrome/browser/ui/web_applications/web_app_browsertest.cc index bd8979f36112bc..278a4921afb223 100644 --- a/chrome/browser/ui/web_applications/web_app_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_browsertest.cc @@ -1913,7 +1913,13 @@ class WebAppBrowserTest_FileHandler : public WebAppBrowserTest { base::test::ScopedFeatureList feature_list_; }; -IN_PROC_BROWSER_TEST_F(WebAppBrowserTest_FileHandler, WebAppFileHandler) { +// TODO(crbug.com/1270961): Flaky on Win and Mac. +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#define MAYBE_WebAppFileHandler DISABLED_WebAppFileHandler +#else +#define MAYBE_WebAppFileHandler WebAppFileHandler +#endif +IN_PROC_BROWSER_TEST_F(WebAppBrowserTest_FileHandler, MAYBE_WebAppFileHandler) { os_hooks_suppress_.reset(); base::ScopedAllowBlockingForTesting allow_blocking;