IOThread: Use URLRequestContextBuilder::NetworkSessionParams.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 019e63e38a510b86bb516274c8b102ee72c3a205..4ab0fff166861d5520a776ee42a805aae7b06743 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -108,7 +108,6 @@
 #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"
@@ -790,8 +789,10 @@ void IOThread::ClearHostCache(
     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() {
@@ -901,7 +902,7 @@ void IOThread::ConstructSystemRequestContext() {
       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);
 
@@ -936,7 +937,7 @@ 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(' ');