Add an option ProxyService::Create() to disable use of proxy auto-config.

BUG=40797
Review URL: http://codereview.chromium.org/3646004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62487 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 6 deletions

diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index e1aa4ae..0134717 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -122,13 +122,19 @@ net::ProxyService* CreateProxyService(
     }
   }
 
-  return net::ProxyService::Create(
+  if (use_v8) {
+    return net::ProxyService::CreateUsingV8ProxyResolver(
+        proxy_config_service,
+        num_pac_threads,
+        context,
+        net_log,
+        io_loop);
+  }
+
+  return net::ProxyService::CreateUsingSystemProxyResolver(
       proxy_config_service,
-      use_v8,
       num_pac_threads,
-      context,
-      net_log,
-      io_loop);
+      net_log);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 91d6afe..8658240 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -159,7 +159,8 @@ class ExperimentURLRequestContext : public URLRequestContext {
       return net::ERR_NOT_IMPLEMENTED;
     }
 
-    *proxy_service = net::ProxyService::Create(config_service.release(), true,
+    *proxy_service = net::ProxyService::CreateUsingV8ProxyResolver(
+        config_service.release(),
         0u, this, NULL, MessageLoop::current());
 
     return net::OK;