diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:44:59 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:44:59 +0000 |
| commit | 1517425f81d0f49afcf4cc49f62ee2aa1995a4ca (patch) | |
| tree | 5e3b44c0eecc5e95322b65e93c3b6a33874dcec5 /chrome | |
| parent | 2687ad7d62c737430aa780f9db9a0a166931a735 (diff) | |
| download | chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.zip chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.tar.gz chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/net/connection_tester.cc | 3 | ||||
| -rw-r--r-- | chrome/service/net/service_url_request_context.cc | 5 | ||||
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 5 |
4 files changed, 17 insertions, 12 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; diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 2b55d0c..cdfe6ec 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.cc @@ -33,9 +33,8 @@ ServiceURLRequestContext::ServiceURLRequestContext() { net::ProxyService::CreateSystemProxyConfigService( g_service_process->io_thread()->message_loop(), g_service_process->file_thread()->message_loop()); - proxy_service_ = - net::ProxyService::Create( - proxy_config_service, false, 0u, this, NULL, NULL); + proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( + proxy_config_service, 0u, NULL); dnsrr_resolver_ = new net::DnsRRResolver; ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_); ssl_config_service_ = new net::SSLConfigServiceDefaults; diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index 92c3832..0a9ca83 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -225,9 +225,8 @@ class PluginInstallerDownloadTest const size_t kNetLogBound = 50u; net_log_.reset(new net::CapturingNetLog(kNetLogBound)); - proxy_service_ = net::ProxyService::Create(proxy_config_service, false, 0, - this, net_log_.get(), - MessageLoop::current()); + proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( + proxy_config_service, 0, net_log_.get()); DCHECK(proxy_service_); ssl_config_service_ = new net::SSLConfigServiceDefaults; |