IOThread: Use URLRequestContextBuilder::NetworkSessionParams.

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 5937f2a67ac4cb7ec1bdb9404a6f95d62162ed22..baabdcdd8ae54ddfd8e9e6897ef50a9c7bdd5c3a 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -38,6 +38,7 @@
 #include "net/http/transport_security_state.h"
 #include "net/net_features.h"
 #include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/core/quic_constants.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_config_service_defaults.h"
@@ -192,19 +193,28 @@ URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
       max_size(0) {}
 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
 
+// TODO(mmenke):  Default values should all match HttpNetworkSession's. Is there
+// a better way to manage that?
 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
     : ignore_certificate_errors(false),
       testing_fixed_http_port(0),
       testing_fixed_https_port(0),
+      enable_tcp_fast_open_for_ssl(false),
+      enable_user_alternate_protocol_ports(false),
       enable_http2(true),
       enable_quic(false),
+      quic_max_packet_length(kDefaultMaxPacketSize),
       quic_max_server_configs_stored_in_properties(0),
       quic_close_sessions_on_ip_change(false),
       quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
       quic_migrate_sessions_on_network_change(false),
       quic_migrate_sessions_early(false),
       quic_disable_bidirectional_streams(false),
-      quic_race_cert_verification(false) {}
+      quic_race_cert_verification(false),
+      enable_token_binding(false),
+      http_09_on_non_default_ports_enabled(false) {
+  quic_supported_versions.push_back(QUIC_VERSION_DEFAULT);
+}
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
 {}
@@ -215,14 +225,21 @@ void URLRequestContextBuilder::HttpNetworkSessionParams::ConfigureSessionParams(
   network_session_params->ignore_certificate_errors = ignore_certificate_errors;
   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_tcp_fast_open_for_ssl =
+      enable_tcp_fast_open_for_ssl;
+  network_session_params->enable_user_alternate_protocol_ports =
+      enable_user_alternate_protocol_ports;
 
   network_session_params->enable_http2 = enable_http2;
 
   network_session_params->enable_quic = enable_quic;
+  network_session_params->quic_supported_versions = quic_supported_versions;
+  network_session_params->quic_max_packet_length = quic_max_packet_length;
   network_session_params->quic_user_agent_id = quic_user_agent_id;
   network_session_params->quic_max_server_configs_stored_in_properties =
       quic_max_server_configs_stored_in_properties;
   network_session_params->quic_connection_options = quic_connection_options;
+  network_session_params->origins_to_force_quic_on = origins_to_force_quic_on;
   network_session_params->quic_close_sessions_on_ip_change =
       quic_close_sessions_on_ip_change;
   network_session_params->quic_idle_connection_timeout_seconds =
@@ -235,6 +252,11 @@ void URLRequestContextBuilder::HttpNetworkSessionParams::ConfigureSessionParams(
       quic_disable_bidirectional_streams;
   network_session_params->quic_race_cert_verification =
       quic_race_cert_verification;
+
+  network_session_params->enable_token_binding = enable_token_binding;
+
+  network_session_params->http_09_on_non_default_ports_enabled =
+      http_09_on_non_default_ports_enabled;
 }
 
 URLRequestContextBuilder::URLRequestContextBuilder()