Temporarily enable headless browser tests on OS_WIN

The original #if defined(OS_WIN) clauses are still in place with OS_WIN
replaced by NO_WIN_FLAKES so that we can easily used to disable them
again if the tests turn out to be still flaky.

Uncomment #define NO_WIN_FLAKES in headless/test/headless_browser_test.h
to disable all flaky tests again.

Change-Id: I2d5a835b449b9dbb900f07e24437050507ccff21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446536Reviewed-by: Peter Kvitek <kvitekp@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Peter Kvitek <kvitekp@chromium.org>
Auto-Submit: Peter Kvitek <kvitekp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813588}

headless/lib/headless_browser_browsertest.cc

@@ -212,7 +212,7 @@ class HeadlessBrowserTestWithProxy : public HeadlessBrowserTest {
   net::SpawnedTestServer proxy_server_;
 };
 
-#if defined(OS_WIN) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
+#if defined(NO_WIN_FLAKES) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 // TODO(crbug.com/1086872): Disabled due to flakiness on Mac ASAN.
 #define MAYBE_SetProxyConfig DISABLED_SetProxyConfig
@@ -245,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTestWithProxy, MAYBE_SetProxyConfig) {
 }
 
 // TODO(crbug.com/867447): Flaky on Windows 10 debug.
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 #define MAYBE_WebGLSupported DISABLED_WebGLSupported
 #else
 #define MAYBE_WebGLSupported WebGLSupported
@@ -286,7 +286,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, ClipboardCopyPasteText) {
   }
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_DefaultSizes DISABLED_DefaultSizes
 #else
@@ -628,7 +628,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, TraceUsingBrowserDevToolsTarget) {
   EXPECT_LT(0u, tracing_data->GetSize());
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_WindowPrint DISABLED_WindowPrint
 #else
@@ -656,7 +656,7 @@ class HeadlessBrowserAllowInsecureLocalhostTest : public HeadlessBrowserTest {
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_AllowInsecureLocalhostFlag DISABLED_AllowInsecureLocalhostFlag
 #else
@@ -707,7 +707,7 @@ class HeadlessBrowserTestAppendCommandLineFlags : public HeadlessBrowserTest {
   bool callback_was_run_ = false;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // Flaky on Win ASAN. See https://crbug.com/884095.
 #define MAYBE_AppendChildProcessCommandLineFlags \
   DISABLED_AppendChildProcessCommandLineFlags
@@ -731,7 +731,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTestAppendCommandLineFlags,
   (void)web_contents;
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_ServerWantsClientCertificate DISABLED_ServerWantsClientCertificate
 #else
@@ -757,7 +757,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest,
   EXPECT_TRUE(WaitForLoad(web_contents));
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_AIAFetching DISABLED_AIAFetching
 #else

headless/lib/headless_browser_context_browsertest.cc

@@ -181,7 +181,7 @@ class HeadlessBrowserUserDataDirTest : public HeadlessBrowserTest {
   base::ScopedTempDir user_data_dir_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_Do DISABLED_Do
 #else
@@ -212,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserUserDataDirTest, MAYBE_Do) {
   EXPECT_FALSE(base::IsDirectoryEmpty(user_data_dir()));
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_IncognitoMode DISABLED_IncognitoMode
 #else

headless/lib/headless_devtools_client_browsertest.cc

@@ -76,7 +76,7 @@ class HeadlessDevToolsClientNavigationTest
   void OnFrameResized(const page::FrameResizedParams& params) override {}
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientNavigationTest);
 #else
@@ -178,7 +178,7 @@ class HeadlessDevToolsClientChangeWindowBoundsTest
   }
 };
 
-#if defined(OS_WIN) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
+#if defined(NO_WIN_FLAKES) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 // TODO(crbug.com/1086872): Disabled due to flakiness on Mac ASAN.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
@@ -266,7 +266,7 @@ class HeadlessDevToolsClientMinimizeWindowTest
             browser::WindowState::MINIMIZED) {}
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessDevToolsClientMinimizeWindowTest);
@@ -282,7 +282,7 @@ class HeadlessDevToolsClientMaximizeWindowTest
             browser::WindowState::MAXIMIZED) {}
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessDevToolsClientMaximizeWindowTest);
@@ -298,7 +298,7 @@ class HeadlessDevToolsClientFullscreenWindowTest
             browser::WindowState::FULLSCREEN) {}
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessDevToolsClientFullscreenWindowTest);
@@ -336,7 +336,7 @@ class HeadlessDevToolsClientEvalTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientEvalTest);
 #else
@@ -378,7 +378,7 @@ class HeadlessDevToolsClientCallbackTest
   bool first_result_received_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientCallbackTest);
 #else
@@ -422,7 +422,7 @@ class HeadlessDevToolsClientObserverTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientObserverTest);
 #else
@@ -472,7 +472,7 @@ class HeadlessDevToolsClientExperimentalTest
   void OnReloadStarted() { FinishAsynchronousTest(); }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessDevToolsClientExperimentalTest);
@@ -529,7 +529,7 @@ class HeadlessDevToolsNavigationControlTest
   bool navigation_requested_ = false;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsNavigationControlTest);
 #else
@@ -571,7 +571,7 @@ class HeadlessCrashObserverTest : public HeadlessAsyncDevTooledBrowserTest,
   content::ScopedAllowRendererCrashes scoped_allow_renderer_crashes_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessCrashObserverTest);
 #else
@@ -632,7 +632,7 @@ class HeadlessDevToolsClientAttachTest
   std::unique_ptr<HeadlessDevToolsClient> other_devtools_client_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientAttachTest);
 #else
@@ -676,7 +676,7 @@ class HeadlessDevToolsMethodCallErrorTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsMethodCallErrorTest);
 #else
@@ -743,7 +743,7 @@ class HeadlessDevToolsNetworkBlockedUrlTest
   std::vector<std::string> failures_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsNetworkBlockedUrlTest);
 #else
@@ -780,7 +780,7 @@ class DevToolsNetworkOfflineEmulationTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(DevToolsNetworkOfflineEmulationTest);
 #else
@@ -817,7 +817,7 @@ class RawDevtoolsProtocolTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(RawDevtoolsProtocolTest);
 #else
@@ -845,7 +845,7 @@ class DevToolsAttachAndDetachNotifications
   bool dev_tools_client_detached_ = false;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(DevToolsAttachAndDetachNotifications);
 #else
@@ -1012,7 +1012,7 @@ class DomTreeExtractionBrowserTest : public HeadlessAsyncDevTooledBrowserTest,
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(DomTreeExtractionBrowserTest);
 #else
@@ -1142,7 +1142,7 @@ class DevToolsSetCookieTest : public HeadlessAsyncDevTooledBrowserTest,
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(DevToolsSetCookieTest);
 #else
@@ -1240,7 +1240,7 @@ class DevtoolsInterceptionWithAuthProxyTest
   std::set<std::string> files_loaded_;
 };
 
-#if defined(OS_WIN) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
+#if defined(NO_WIN_FLAKES) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 // TODO(crbug.com/1086872): Disabled due to flakiness on Mac ASAN.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(DevtoolsInterceptionWithAuthProxyTest);
@@ -1269,7 +1269,7 @@ class NavigatorLanguages : public HeadlessAsyncDevTooledBrowserTest {
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(NavigatorLanguages);
 #else

headless/lib/headless_origin_trials_browsertest.cc

@@ -55,7 +55,7 @@ class HeadlessOriginTrialsBrowserTest : public HeadlessBrowserTest {
 };
 
 // Flaky on Windows Debug https://crbug.com/1090801
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 #define MAYBE_TrialsCanBeEnabled DISABLED_TrialsCanBeEnabled
 #else
 #define MAYBE_TrialsCanBeEnabled TrialsCanBeEnabled
@@ -85,7 +85,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessOriginTrialsBrowserTest,
 }
 
 // Flaky on Windows Debug https://crbug.com/1090801
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 #define MAYBE_TrialsDisabledByDefault DISABLED_TrialsDisabledByDefault
 #else
 #define MAYBE_TrialsDisabledByDefault TrialsDisabledByDefault
@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessOriginTrialsBrowserTest,
 }
 
 // Flaky on Windows Debug https://crbug.com/1090801
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 #define MAYBE_WebComponentsV0CustomElements \
   DISABLED_WebComponentsV0CustomElements
 #else

headless/lib/headless_web_contents_browsertest.cc

@@ -64,7 +64,7 @@ using testing::UnorderedElementsAreArray;
 namespace headless {
 class HeadlessWebContentsTest : public HeadlessBrowserTest {};
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_Navigation DISABLED_Navigation
 #else
@@ -86,7 +86,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, MAYBE_Navigation) {
               UnorderedElementsAre(web_contents));
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_WindowOpen DISABLED_WindowOpen
 #else
@@ -135,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, MAYBE_WindowOpen) {
 #endif  // !defined(OS_MAC)
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_FocusOfHeadlessWebContents_IsIndependent \
   DISABLED_FocusOfHeadlessWebContents_IsIndependent
@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest,
   EXPECT_TRUE(has_focus->GetResult()->GetValue()->GetBool());
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_HandleSSLError DISABLED_HandleSSLError
 #else
@@ -254,7 +254,7 @@ class HeadlessWebContentsScreenshotTest
 HEADLESS_ASYNC_DEVTOOLED_TEST_P(HeadlessWebContentsScreenshotTest);
 
 // Instantiate test case for both software and gpu compositing modes.
-#if !defined(OS_WIN)
+#if !defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled on Windows due to flakiness.
 INSTANTIATE_TEST_SUITE_P(HeadlessWebContentsScreenshotTests,
                          HeadlessWebContentsScreenshotTest,
@@ -290,7 +290,7 @@ class HeadlessWebContentsScreenshotWindowPositionTest
 };
 
 // Flaky on Windows Debug https://crbug.com/1090801
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_P(
     HeadlessWebContentsScreenshotWindowPositionTest);
 #else
@@ -299,7 +299,7 @@ HEADLESS_ASYNC_DEVTOOLED_TEST_P(
 #endif
 
 // Instantiate test case for both software and gpu compositing modes.
-#if defined(OS_WIN) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
+#if defined(NO_WIN_FLAKES) || (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
 // TODO(crbug.com/1045980): Disabled on Windows due to flakiness.
 // TODO(crbug.com/1086872): Disabled due to flakiness on Mac ASAN.
 INSTANTIATE_TEST_SUITE_P(HeadlessWebContentsScreenshotWindowPositionTests,
@@ -387,7 +387,7 @@ class HeadlessWebContentsPDFTest : public HeadlessAsyncDevTooledBrowserTest {
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessWebContentsPDFTest);
 #else
@@ -474,7 +474,7 @@ class HeadlessWebContentsPDFStreamTest
   std::string base64_data_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessWebContentsPDFStreamTest);
 #else
@@ -679,7 +679,7 @@ class HeadlessWebContentsTaggedPDFTest
 };
 
 // Flaky on Windows Debug https://crbug.com/1090801
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if defined(NO_WIN_FLAKES) && !defined(NDEBUG)
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessWebContentsTaggedPDFTest);
 #else
 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessWebContentsTaggedPDFTest);
@@ -732,7 +732,7 @@ class HeadlessWebContentsRequestStorageQuotaTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessWebContentsRequestStorageQuotaTest);
@@ -740,7 +740,7 @@ DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessWebContentsRequestStorageQuotaTest);
 #endif
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_BrowserTabChangeContent DISABLED_BrowserTabChangeContent
 #else
@@ -765,7 +765,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessWebContentsTest, MAYBE_BrowserTabChangeContent) {
   EXPECT_TRUE(WaitForLoad(web_contents));
 }
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 #define MAYBE_BrowserOpenInTab DISABLED_BrowserOpenInTab
 #else
@@ -1028,7 +1028,7 @@ class HeadlessWebContentsBeginFrameControlBasicTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessWebContentsBeginFrameControlBasicTest);
@@ -1117,7 +1117,7 @@ class HeadlessWebContentsBeginFrameControlViewportTest
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(
     HeadlessWebContentsBeginFrameControlViewportTest);
@@ -1156,7 +1156,7 @@ class CookiesEnabled : public HeadlessAsyncDevTooledBrowserTest,
   }
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045980): Disabled due to flakiness.
 DISABLED_HEADLESS_ASYNC_DEVTOOLED_TEST_F(CookiesEnabled);
 #else

headless/test/headless_browser_test.h

@@ -15,6 +15,12 @@
 #include "headless/public/headless_web_contents.h"
 #include "headless/test/test_network_interceptor.h"
 
+// Uncomment |NO_WIN_FLAKES| to disable tests that are known to be flaky
+// on Windows. (crbug.com/1045980, crbug.com/867447, crbug.com/1090801 ...)
+#ifdef OS_WIN
+// #define NO_WIN_FLAKES
+#endif
+
 namespace base {
 class RunLoop;
 }

headless/test/headless_client_browsertest.cc

@@ -62,7 +62,7 @@ class HeadlessClientBrowserTest : public HeadlessAsyncDevTooledBrowserTest,
   std::unique_ptr<HeadlessDevToolsClient> session_client_;
 };
 
-#if defined(OS_WIN)
+#if defined(NO_WIN_FLAKES)
 // TODO(crbug.com/1045971): Disabled due to flakiness.
 #define MAYBE_FlatProtocolAccess DISABLED_FlatProtocolAccess
 #else

headless/test/headless_protocol_browsertest.cc

@@ -196,7 +196,7 @@ class HeadlessProtocolBrowserTest
 
 // TODO(crbug.com/867447): The whole test suite is extremely flaky on Win dbg.
 // TODO(crbug.com/1086872): The whole test suite is flaky on Mac ASAN.
-#if (defined(OS_WIN) && !defined(NDEBUG)) || \
+#if (defined(NO_WIN_FLAKES) && !defined(NDEBUG)) || \
     (defined(OS_MAC) && defined(ADDRESS_SANITIZER))
 #define HEADLESS_PROTOCOL_TEST(TEST_NAME, SCRIPT_NAME)                        \
   IN_PROC_BROWSER_TEST_F(HeadlessProtocolBrowserTest, DISABLED_##TEST_NAME) { \
@@ -319,7 +319,7 @@ class HeadlessProtocolCompositorBrowserTest
 // rcl=5811aa08e60ba5ac7622f029163213cfbdb682f7&l=32
 // TODO(crbug.com/954398): Suite is timeout-flaky on Windows.
 // TODO(crbug.com/1020046): Suite is flaky on TSan Linux.
-#if defined(OS_MAC) || defined(OS_WIN) || \
+#if defined(OS_MAC) || defined(NO_WIN_FLAKES) || \
     ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(THREAD_SANITIZER))
 #define HEADLESS_PROTOCOL_COMPOSITOR_TEST(TEST_NAME, SCRIPT_NAME) \
   IN_PROC_BROWSER_TEST_F(HeadlessProtocolCompositorBrowserTest,   \
@@ -343,8 +343,9 @@ HEADLESS_PROTOCOL_COMPOSITOR_TEST(
     CompositorImageAnimation,
     "emulation/compositor-image-animation-test.js")
 
-// Flaky on Linux. TODO(crbug.com/986027): Re-enable.
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
+// Flaky on all platforms. TODO(crbug.com/986027): Re-enable.
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+    defined(OS_FUCHSIA)
 #define MAYBE_CompositorCssAnimation DISABLED_CompositorCssAnimation
 #else
 #define MAYBE_CompositorCssAnimation CompositorCssAnimation
@@ -440,7 +441,13 @@ HEADLESS_PROTOCOL_COMPOSITOR_TEST(RendererCanvas, "sanity/renderer-canvas.js")
 
 HEADLESS_PROTOCOL_COMPOSITOR_TEST(RendererOpacityAnimation,
                                   "sanity/renderer-opacity-animation.js")
-HEADLESS_PROTOCOL_COMPOSITOR_TEST(BrowserSetInitialProxyConfig,
+// Flaky on Windows (crbug.com/1134929).
+#if defined(OS_WIN)
+#define MAYBE_BrowserSetInitialProxyConfig DISABLED_BrowserSetInitialProxyConfig
+#else
+#define MAYBE_BrowserSetInitialProxyConfig BrowserSetInitialProxyConfig
+#endif
+HEADLESS_PROTOCOL_COMPOSITOR_TEST(MAYBE_BrowserSetInitialProxyConfig,
                                   "sanity/browser-set-initial-proxy-config.js")
 
 }  // namespace headless