Add method to init HttpNetworkSession::Params from context bulder params

net/url_request/url_request_context_builder.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 "net/url_request/url_request_context_builder.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 180 matching lines @@
       quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
       quic_close_sessions_on_ip_change(false),
       quic_migrate_sessions_on_network_change(false),
       quic_migrate_sessions_early(false),
       quic_disable_bidirectional_streams(false),
       quic_race_cert_verification(false) {}
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
 {}
 
+void URLRequestContextBuilder::HttpNetworkSessionParams::ConfigureSessionParams(
+    HttpNetworkSession::Params* network_session_params) const {
+  network_session_params->ignore_certificate_errors = ignore_certificate_errors;
+  network_session_params->host_mapping_rules = host_mapping_rules;

[Randy Smith (Not in Mondays), 2017/05/12 19:43:52]

Not relevant to this CL (no behavior change), so just a comment, but copying raw
pointers like this without commentary as to expected lifetimes scares me.  

[mmenke, 2017/05/12 20:13:17]

Yea, I agree with that.  I think use of this is rare enough, and we have few
enough HttpNetworkSessions, that copying makes more sense.  Not going to address
it now, but may once I start working on the network service code.

+  network_session_params->testing_fixed_http_port = testing_fixed_http_port;
+  network_session_params->testing_fixed_https_port = testing_fixed_https_port;
+
+  network_session_params->enable_http2 = enable_http2;
+
+  network_session_params->enable_quic = enable_quic;
+  network_session_params->quic_max_server_configs_stored_in_properties =
+      quic_max_server_configs_stored_in_properties;
+  network_session_params->quic_idle_connection_timeout_seconds =
+      quic_idle_connection_timeout_seconds;
+  network_session_params->quic_connection_options = quic_connection_options;
+  network_session_params->quic_close_sessions_on_ip_change =
+      quic_close_sessions_on_ip_change;
+  network_session_params->quic_migrate_sessions_on_network_change =
+      quic_migrate_sessions_on_network_change;
+  network_session_params->quic_user_agent_id = quic_user_agent_id;

[Randy Smith (Not in Mondays), 2017/05/12 19:43:52]

nit, suggestion: Move this to be in order with the declaration of
HttpNetworkSessionParams, i.e. above
quic_max_server_configs_stored_in_properties.

[mmenke, 2017/05/12 20:13:17]

Done.  Also rearranged these to match order in HttpNetworkSession::Params.

+  network_session_params->quic_migrate_sessions_early =
+      quic_migrate_sessions_early;
+  network_session_params->quic_disable_bidirectional_streams =
+      quic_disable_bidirectional_streams;
+  network_session_params->quic_race_cert_verification =
+      quic_race_cert_verification;
+}
+
 URLRequestContextBuilder::URLRequestContextBuilder()
     : name_(nullptr),
       enable_brotli_(false),
       network_quality_estimator_(nullptr),
       data_enabled_(false),
 #if !BUILDFLAG(DISABLE_FILE_SUPPORT)
       file_enabled_(false),
 #endif
 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
       ftp_enabled_(false),
@@ skipping 195 matching lines @@
   }
   storage->set_ct_policy_enforcer(base::MakeUnique<CTPolicyEnforcer>());
 
   if (throttling_enabled_) {
     storage->set_throttler_manager(
         base::MakeUnique<URLRequestThrottlerManager>());
   }
 
   HttpNetworkSession::Params network_session_params;
   SetHttpNetworkSessionComponents(context.get(), &network_session_params);
+  http_network_session_params_.ConfigureSessionParams(&network_session_params);
 
-  network_session_params.ignore_certificate_errors =
-      http_network_session_params_.ignore_certificate_errors;
-  network_session_params.host_mapping_rules =
-      http_network_session_params_.host_mapping_rules;
-  network_session_params.testing_fixed_http_port =
-      http_network_session_params_.testing_fixed_http_port;
-  network_session_params.testing_fixed_https_port =
-      http_network_session_params_.testing_fixed_https_port;
-  network_session_params.enable_http2 =
-      http_network_session_params_.enable_http2;
-  network_session_params.enable_quic = http_network_session_params_.enable_quic;
-  network_session_params.quic_max_server_configs_stored_in_properties =
-      http_network_session_params_.quic_max_server_configs_stored_in_properties;
-  network_session_params.quic_idle_connection_timeout_seconds =
-      http_network_session_params_.quic_idle_connection_timeout_seconds;
-  network_session_params.quic_connection_options =
-      http_network_session_params_.quic_connection_options;
-  network_session_params.quic_close_sessions_on_ip_change =
-      http_network_session_params_.quic_close_sessions_on_ip_change;
-  network_session_params.quic_migrate_sessions_on_network_change =
-      http_network_session_params_.quic_migrate_sessions_on_network_change;
-  network_session_params.quic_user_agent_id =
-      http_network_session_params_.quic_user_agent_id;
-  network_session_params.quic_migrate_sessions_early =
-      http_network_session_params_.quic_migrate_sessions_early;
-  network_session_params.quic_disable_bidirectional_streams =
-      http_network_session_params_.quic_disable_bidirectional_streams;
-  network_session_params.quic_race_cert_verification =
-      http_network_session_params_.quic_race_cert_verification;
   if (proxy_delegate_) {
     network_session_params.proxy_delegate = proxy_delegate_.get();
     storage->set_proxy_delegate(std::move(proxy_delegate_));
   }
   if (socket_performance_watcher_factory_) {
     network_session_params.socket_performance_watcher_factory =
         socket_performance_watcher_factory_;
   }
 
   storage->set_http_network_session(
@@ skipping 62 matching lines @@
     }
     url_request_interceptors_.clear();
   }
   storage->set_job_factory(std::move(top_job_factory));
   // TODO(willchan): Support sdch.
 
   return std::move(context);
 }
 
 }  // namespace net