[headless] Added 'no-system-proxy-config-service' command line switch.

Adding this switch to headless browser tests ensures that proxy related
tests are not affected by a platform specific system proxy configuration
service.

This fixes HeadlessProtocolCompositorBrowserTest.BrowserSetInitialProxyConfig
issues when running on Windows.

Bug: 1134929
Change-Id: Ib245a4fe660eacaab944521a56ed9f2d1f525b73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489779Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Peter Kvitek <kvitekp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819454}

headless/app/headless_shell_switches.cc

@@ -75,6 +75,9 @@ const char kProxyBypassList[] = "proxy-bypass-list";
 // affects HTTP and HTTPS requests.
 const char kProxyServer[] = "proxy-server";
 
+// Do not use system proxy configuration service.
+const char kNoSystemProxyConfigService[] = "no-system-proxy-config-service";
+
 // Use the given address instead of the default loopback for accepting remote
 // debugging connections. Should be used together with --remote-debugging-port.
 // Note that the remote debugging protocol does not perform any authentication,

headless/app/headless_shell_switches.h

@@ -27,6 +27,7 @@ HEADLESS_EXPORT extern const char kPrintToPDF[];
 HEADLESS_EXPORT extern const char kPrintToPDFNoHeader[];
 HEADLESS_EXPORT extern const char kProxyBypassList[];
 HEADLESS_EXPORT extern const char kProxyServer[];
+HEADLESS_EXPORT extern const char kNoSystemProxyConfigService[];
 HEADLESS_EXPORT extern const char kRemoteDebuggingAddress[];
 HEADLESS_EXPORT extern const char kRepl[];
 HEADLESS_EXPORT extern const char kScreenshot[];

headless/lib/browser/headless_request_context_manager.cc

@@ -210,8 +210,13 @@ HeadlessRequestContextManager::HeadlessRequestContextManager(
               : nullptr),
       resource_context_(std::make_unique<content::ResourceContext>()) {
   if (!proxy_config_) {
-    proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>(
-        base::ThreadTaskRunnerHandle::Get());
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(switches::kNoSystemProxyConfigService)) {
+      proxy_config_ = std::make_unique<net::ProxyConfig>();
+    } else {
+      proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>(
+          base::ThreadTaskRunnerHandle::Get());
+    }
   }
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   auto crypt_config = BuildCryptConfigOnce(user_data_path_);

headless/test/headless_protocol_browsertest.cc

@@ -16,6 +16,7 @@
 #include "components/viz/common/switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test.h"
+#include "headless/app/headless_shell_switches.h"
 #include "headless/public/devtools/domains/runtime.h"
 #include "headless/public/headless_browser.h"
 #include "headless/public/headless_browser_context.h"
@@ -56,6 +57,10 @@ class HeadlessProtocolBrowserTest
     // Make sure the navigations spawn new processes. We run test harness
     // in one process (harness.test) and tests in another.
     command_line->AppendSwitch(::switches::kSitePerProcess);
+
+    // Make sure proxy related tests are not affected by a platform specific
+    // system proxy configuration service.
+    command_line->AppendSwitch(switches::kNoSystemProxyConfigService);
   }
 
  private:
@@ -286,8 +291,8 @@ class HeadlessProtocolCompositorBrowserTest
     static const char* const compositor_switches[] = {
         // We control BeginFrames ourselves and need all compositing stages to
         // run.
-        switches::kRunAllCompositorStagesBeforeDraw,
-        switches::kDisableNewContentRenderingTimeout,
+        ::switches::kRunAllCompositorStagesBeforeDraw,
+        ::switches::kDisableNewContentRenderingTimeout,
 
         // Animtion-only BeginFrames are only supported when updates from the
         // impl-thread are disabled, see go/headless-rendering.
@@ -433,13 +438,7 @@ HEADLESS_PROTOCOL_COMPOSITOR_TEST(RendererCanvas, "sanity/renderer-canvas.js")
 
 HEADLESS_PROTOCOL_COMPOSITOR_TEST(RendererOpacityAnimation,
                                   "sanity/renderer-opacity-animation.js")
-// 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,
+HEADLESS_PROTOCOL_COMPOSITOR_TEST(BrowserSetInitialProxyConfig,
                                   "sanity/browser-set-initial-proxy-config.js")
 
 }  // namespace headless