IOThread: Use URLRequestContextBuilder::NetworkSessionParams.

components/network_session_configurator/network_session_configurator.cc

Index: components/network_session_configurator/network_session_configurator.cc
diff --git a/components/network_session_configurator/network_session_configurator.cc b/components/network_session_configurator/network_session_configurator.cc
index e885f4ae8091eecf7eb52973953e9fc7a7712cd9..7836904703a0b65184636a8826680fe4a15b4776 100644
--- a/components/network_session_configurator/network_session_configurator.cc
+++ b/components/network_session_configurator/network_session_configurator.cc
@@ -49,8 +49,9 @@ const std::string& GetVariationParam(
   return it->second;
 }
 
-void ConfigureTCPFastOpenParams(base::StringPiece tfo_trial_group,
-                                net::HttpNetworkSession::Params* params) {
+void ConfigureTCPFastOpenParams(
+    base::StringPiece tfo_trial_group,
+    net::URLRequestContextBuilder::HttpNetworkSessionParams* params) {
   if (tfo_trial_group == kTCPFastOpenHttpsEnabledGroupName)
     params->enable_tcp_fast_open_for_ssl = true;
 }
@@ -81,9 +82,10 @@ net::SettingsMap GetHttp2Settings(
   return http2_settings;
 }
 
-void ConfigureHttp2Params(base::StringPiece http2_trial_group,
-                          const VariationParameters& http2_trial_params,
-                          net::HttpNetworkSession::Params* params) {
+void ConfigureHttp2Params(
+    base::StringPiece http2_trial_group,
+    const VariationParameters& http2_trial_params,
+    net::URLRequestContextBuilder::HttpNetworkSessionParams* params) {
   if (http2_trial_group.starts_with(kHttp2FieldTrialDisablePrefix)) {
     params->enable_http2 = false;
     return;
@@ -240,12 +242,13 @@ bool ShouldEnableServerPushCancelation(
       "true");
 }
 
-void ConfigureQuicParams(base::StringPiece quic_trial_group,
-                         const VariationParameters& quic_trial_params,
-                         bool is_quic_force_disabled,
-                         bool is_quic_force_enabled,
-                         const std::string& quic_user_agent_id,
-                         net::HttpNetworkSession::Params* params) {
+void ConfigureQuicParams(
+    base::StringPiece quic_trial_group,
+    const VariationParameters& quic_trial_params,
+    bool is_quic_force_disabled,
+    bool is_quic_force_enabled,
+    const std::string& quic_user_agent_id,
+    net::URLRequestContextBuilder::HttpNetworkSessionParams* params) {
   params->enable_quic = ShouldEnableQuic(
       quic_trial_group, quic_trial_params, is_quic_force_disabled,
       is_quic_force_enabled);
@@ -327,10 +330,11 @@ net::QuicVersion ParseQuicVersion(const std::string& quic_version) {
   return net::QUIC_VERSION_UNSUPPORTED;
 }
 
-void ParseFieldTrials(bool is_quic_force_disabled,
-                      bool is_quic_force_enabled,
-                      const std::string& quic_user_agent_id,
-                      net::HttpNetworkSession::Params* params) {
+void ParseFieldTrials(
+    bool is_quic_force_disabled,
+    bool is_quic_force_enabled,
+    const std::string& quic_user_agent_id,
+    net::URLRequestContextBuilder::HttpNetworkSessionParams* params) {
   std::string quic_trial_group =
       base::FieldTrialList::FindFullName(kQuicFieldTrialName);
   VariationParameters quic_trial_params;