IOThread: Use URLRequestContextBuilder::NetworkSessionParams.

chrome/browser/io_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/io_thread.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 90 matching lines @@
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "url/url_constants.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #endif
 
 #if defined(USE_NSS_CERTS)
@@ skipping 661 matching lines @@
 
 void IOThread::ClearHostCache(
     const base::Callback<bool(const std::string&)>& host_filter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   net::HostCache* host_cache = globals_->host_resolver->GetHostCache();
   if (host_cache)
     host_cache->ClearForHosts(host_filter);
 }
 
-const net::HttpNetworkSession::Params& IOThread::NetworkSessionParams() const {
-  return params_;
+net::HttpNetworkSession::Params IOThread::NetworkSessionParams() const {
+  net::HttpNetworkSession::Params session_params;
+  params_.ConfigureSessionParams(&session_params);
+  return session_params;
 }
 
 void IOThread::DisableQuic() {
   params_.enable_quic = false;
 
   if (globals_->system_request_context_storage)
     globals_->system_request_context_storage->http_network_session()
         ->DisableQuic();
 }
 
@@ skipping 89 matching lines @@
   context_storage->set_ct_policy_enforcer(
       base::MakeUnique<net::CTPolicyEnforcer>());
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   context_storage->set_proxy_service(ProxyServiceFactory::CreateProxyService(
       net_log_, context, context->network_delegate(),
       std::move(system_proxy_config_service_), command_line,
       WpadQuickCheckEnabled(), PacHttpsUrlStrippingEnabled()));
 
-  net::HttpNetworkSession::Params system_params(params_);
+  net::HttpNetworkSession::Params system_params(NetworkSessionParams());
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
       context, &system_params);
 
   context_storage->set_http_network_session(
       base::MakeUnique<net::HttpNetworkSession>(system_params));
   context_storage->set_http_transaction_factory(
       base::MakeUnique<net::HttpNetworkLayer>(
           context_storage->http_network_session()));
 
   std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
@@ skipping 14 matching lines @@
 #endif
 
   context_storage->set_job_factory(std::move(job_factory));
 }
 
 // static
 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine(
     const base::CommandLine& command_line,
     bool is_quic_allowed_by_policy,
     bool http_09_on_non_default_ports_enabled,
-    net::HttpNetworkSession::Params* params) {
+    net::URLRequestContextBuilder::HttpNetworkSessionParams* params) {
   std::string quic_user_agent_id = chrome::GetChannelString();
   if (!quic_user_agent_id.empty())
     quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(
       version_info::GetProductNameAndVersionForUserAgent());
   quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(content::BuildOSCpuInfo());
 
   bool is_quic_force_disabled = !is_quic_allowed_by_policy ||
                                 command_line.HasSwitch(switches::kDisableQuic);
@@ skipping 71 matching lines @@
         GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort);
   }
 
   params->http_09_on_non_default_ports_enabled =
       http_09_on_non_default_ports_enabled;
 }
 
 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() {
   return base::Bind(&UpdateMetricsUsagePrefsOnUIThread);
 }