| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index 44a5755307f924783d743e69ad868cb07b805748..5e2080252100f4e3eafe89cb203cebfce1ca93a2 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -442,6 +442,10 @@ IOThread::IOThread(
|
| local_state);
|
| quick_check_enabled_.MoveToThread(io_thread_proxy);
|
|
|
| + pac_https_url_stripping_enabled_.Init(prefs::kPacHttpsUrlStrippingEnabled,
|
| + local_state);
|
| + pac_https_url_stripping_enabled_.MoveToThread(io_thread_proxy);
|
| +
|
| is_spdy_allowed_by_policy_ =
|
| policy_service
|
| ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
|
| @@ -1049,6 +1053,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
|
| data_reduction_proxy::RegisterPrefs(registry);
|
| registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
|
| registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
|
| + registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
|
| }
|
|
|
| void IOThread::UpdateServerWhitelist() {
|
| @@ -1159,7 +1164,7 @@ void IOThread::InitSystemRequestContextOnIOThread() {
|
| net_log_, globals_->proxy_script_fetcher_context.get(),
|
| globals_->system_network_delegate.get(),
|
| std::move(system_proxy_config_service_), command_line,
|
| - quick_check_enabled_.GetValue());
|
| + WpadQuickCheckEnabled(), PacHttpsUrlStrippingEnabled());
|
|
|
| globals_->system_request_context.reset(
|
| ConstructSystemRequestContext(globals_, params_, net_log_));
|
| @@ -1558,6 +1563,14 @@ net::QuicVersion IOThread::NetworkSessionConfigurator::ParseQuicVersion(
|
| return net::QUIC_VERSION_UNSUPPORTED;
|
| }
|
|
|
| +bool IOThread::WpadQuickCheckEnabled() const {
|
| + return quick_check_enabled_.GetValue();
|
| +}
|
| +
|
| +bool IOThread::PacHttpsUrlStrippingEnabled() const {
|
| + return pac_https_url_stripping_enabled_.GetValue();
|
| +}
|
| +
|
| // static
|
| net::URLRequestContext* IOThread::ConstructSystemRequestContext(
|
| IOThread::Globals* globals,
|
|
|