diff options
| -rw-r--r-- | chrome/test/chromedriver/net/url_request_context_getter.cc | 2 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.cc | 15 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.h | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/chrome/test/chromedriver/net/url_request_context_getter.cc b/chrome/test/chromedriver/net/url_request_context_getter.cc index b5b4a45..cf21fc8 100644 --- a/chrome/test/chromedriver/net/url_request_context_getter.cc +++ b/chrome/test/chromedriver/net/url_request_context_getter.cc @@ -39,9 +39,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { // net::HttpServer fails to parse headers if user-agent header is blank. builder.set_user_agent("chromedriver"); builder.DisableHttpCache(); -#if defined(OS_LINUX) || defined(OS_ANDROID) builder.set_proxy_config_service(new ProxyConfigServiceDirect()); -#endif url_request_context_.reset(builder.Build()); } return url_request_context_.get(); 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_; |