Chromium Code Reviews| Index: net/url_request/url_request_context_builder.cc |
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc |
| index da9363077b19e2d240e6eec16901ce832efa24fd..12042d11cdf16b8e970ed3b787ae32ae06b9e54c 100644 |
| --- a/net/url_request/url_request_context_builder.cc |
| +++ b/net/url_request/url_request_context_builder.cc |
| @@ -208,6 +208,9 @@ URLRequestContextBuilder::URLRequestContextBuilder() |
| sdch_enabled_(false), |
| cookie_store_set_by_client_(false), |
| net_log_(nullptr), |
| + pac_quick_check_enabled_(true), |
| + pac_sanitize_url_policy_(ProxyService::SanitizeUrlPolicy::SAFE), |
| + ssl_config_service_(nullptr), |
| socket_performance_watcher_factory_(nullptr) { |
| } |
| @@ -327,7 +330,11 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() { |
| } |
| storage->set_host_resolver(std::move(host_resolver_)); |
| - storage->set_ssl_config_service(new SSLConfigServiceDefaults); |
| + if (!ssl_config_service_) { |
|
eroman
2017/06/08 00:45:56
These changes seem unrelated.
mmenke
2017/06/08 16:36:28
Thanks! Reverted this change (Kept the quick_chec
|
| + storage->set_ssl_config_service(new SSLConfigServiceDefaults); |
| + } else { |
| + context->set_ssl_config_service(ssl_config_service_); |
| + } |
| if (!http_auth_handler_factory_) { |
| http_auth_handler_factory_ = |
| @@ -407,6 +414,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() { |
| CreateProxyService(std::move(proxy_config_service_), context.get(), |
| context->host_resolver(), |
| context->network_delegate(), context->net_log()); |
| + proxy_service_->set_quick_check_enabled(pac_quick_check_enabled_); |
| + proxy_service_->set_sanitize_url_policy(pac_sanitize_url_policy_); |
| } |
| storage->set_proxy_service(std::move(proxy_service_)); |