Commit b39389a1 authored by Peter Kvitek's avatar Peter Kvitek Committed by Commit Bot

[Headless] Removed leftover ifdefs from BrowserSetProxyConfig test.

These ifdefs were there since the test was part of Compositor fixture,
which is not the case anymore, hence no need to limit testing on
platforms that don't support BeginFrame  control.

Change-Id: I331e656ea64e7f2941a2eb3b7584b98caf21ceff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511855Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Peter Kvitek <kvitekp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822918}
parent fb6bf69e
...@@ -294,28 +294,12 @@ class HeadlessProtocolBrowserTestWithProxy ...@@ -294,28 +294,12 @@ class HeadlessProtocolBrowserTestWithProxy
net::EmbeddedTestServer proxy_server_; net::EmbeddedTestServer proxy_server_;
}; };
// BeginFrameControl is not supported on MacOS yet, see: https://cs.chromium.org
// chromium/src/headless/lib/browser/protocol/target_handler.cc?
// 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(NO_WIN_FLAKES) || \
((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(THREAD_SANITIZER))
#define HEADLESS_PROTOCOL_TEST_WITH_PROXY(TEST_NAME, SCRIPT_NAME) \
IN_PROC_BROWSER_TEST_F(HeadlessProtocolBrowserTestWithProxy, \
DISABLED_##TEST_NAME) { \
test_folder_ = "/protocol/"; \
script_name_ = SCRIPT_NAME; \
RunTest(); \
}
#else
#define HEADLESS_PROTOCOL_TEST_WITH_PROXY(TEST_NAME, SCRIPT_NAME) \ #define HEADLESS_PROTOCOL_TEST_WITH_PROXY(TEST_NAME, SCRIPT_NAME) \
IN_PROC_BROWSER_TEST_F(HeadlessProtocolBrowserTestWithProxy, TEST_NAME) { \ IN_PROC_BROWSER_TEST_F(HeadlessProtocolBrowserTestWithProxy, TEST_NAME) { \
test_folder_ = "/protocol/"; \ test_folder_ = "/protocol/"; \
script_name_ = SCRIPT_NAME; \ script_name_ = SCRIPT_NAME; \
RunTest(); \ RunTest(); \
} }
#endif
HEADLESS_PROTOCOL_TEST_WITH_PROXY(BrowserSetProxyConfig, HEADLESS_PROTOCOL_TEST_WITH_PROXY(BrowserSetProxyConfig,
"sanity/browser-set-proxy-config.js") "sanity/browser-set-proxy-config.js")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment