summaryrefslogtreecommitdiff
path: root/chromium/headless/lib/headless_browser_browsertest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/headless/lib/headless_browser_browsertest.cc')
-rw-r--r--chromium/headless/lib/headless_browser_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/headless/lib/headless_browser_browsertest.cc b/chromium/headless/lib/headless_browser_browsertest.cc
index 277b7201a27..9dc68729e5b 100644
--- a/chromium/headless/lib/headless_browser_browsertest.cc
+++ b/chromium/headless/lib/headless_browser_browsertest.cc
@@ -212,8 +212,9 @@ class HeadlessBrowserTestWithProxy : public HeadlessBrowserTest {
net::SpawnedTestServer proxy_server_;
};
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_MACOSX) && 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
#else
#define MAYBE_SetProxyConfig SetProxyConfig