diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 01:34:12 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 01:34:12 +0000 |
| commit | ed0b0b4c778c576456a3fa15ad0f001b9124d1a1 (patch) | |
| tree | 46552f6a12e35b497fb38d89444428bbf2db103e /net | |
| parent | 622a61abfe230fd7f65f733d2ab99e4411a5ee2c (diff) | |
| download | chromium_src-ed0b0b4c778c576456a3fa15ad0f001b9124d1a1.zip chromium_src-ed0b0b4c778c576456a3fa15ad0f001b9124d1a1.tar.gz chromium_src-ed0b0b4c778c576456a3fa15ad0f001b9124d1a1.tar.bz2 | |
Expose method for setting the proxy config in URLRequestContextBuilder for all platforms.
This is so we can bypass the proxy in ChromeDriver (see chrome/test/chromedriver/README).
This is to get around problem many users are having where windows autodetect setting breaks chromedriver.
BUG=chromedriver:310,chromedriver:615
Review URL: https://codereview.chromium.org/68213021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_context_builder.cc | 15 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.h | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index dce8214..0cef454 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -200,12 +200,10 @@ URLRequestContextBuilder::URLRequestContextBuilder() URLRequestContextBuilder::~URLRequestContextBuilder() {} -#if defined(OS_LINUX) || defined(OS_ANDROID) void URLRequestContextBuilder::set_proxy_config_service( ProxyConfigService* proxy_config_service) { proxy_config_service_.reset(proxy_config_service); } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) URLRequestContext* URLRequestContextBuilder::Build() { BasicURLRequestContext* context = new BasicURLRequestContext; @@ -228,10 +226,15 @@ URLRequestContext* URLRequestContextBuilder::Build() { #if defined(OS_LINUX) || defined(OS_ANDROID) ProxyConfigService* proxy_config_service = proxy_config_service_.release(); #else - ProxyConfigService* proxy_config_service = - ProxyService::CreateSystemProxyConfigService( - base::ThreadTaskRunnerHandle::Get().get(), - context->file_message_loop()); + ProxyConfigService* proxy_config_service = NULL; + if (proxy_config_service_) { + proxy_config_service = proxy_config_service_.release(); + } else { + proxy_config_service = + ProxyService::CreateSystemProxyConfigService( + base::ThreadTaskRunnerHandle::Get().get(), + context->file_message_loop()); + } #endif // defined(OS_LINUX) || defined(OS_ANDROID) storage->set_proxy_service( ProxyService::CreateUsingSystemProxyResolver( diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h index 20fc30e..91c6dd2 100644 --- a/net/url_request/url_request_context_builder.h +++ b/net/url_request/url_request_context_builder.h @@ -69,9 +69,7 @@ class NET_EXPORT URLRequestContextBuilder { URLRequestContextBuilder(); ~URLRequestContextBuilder(); -#if defined(OS_LINUX) || defined(OS_ANDROID) void set_proxy_config_service(ProxyConfigService* proxy_config_service); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) // Call these functions to specify hard-coded Accept-Language // or User-Agent header values for all requests that don't @@ -138,9 +136,7 @@ class NET_EXPORT URLRequestContextBuilder { bool http_cache_enabled_; HttpCacheParams http_cache_params_; HttpNetworkSessionParams http_network_session_params_; -#if defined(OS_LINUX) || defined(OS_ANDROID) scoped_ptr<ProxyConfigService> proxy_config_service_; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) scoped_ptr<NetworkDelegate> network_delegate_; scoped_ptr<FtpTransactionFactory> ftp_transaction_factory_; |