Update from https://crrev.com/311076

net/http/http_network_session.cc

Index: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 12620cb5bc5618fb72583e847acdc2a4824831ac..50420db82759dd393b918792ea9e5d2705bc2d0d 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -44,8 +44,8 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(
       params.host_resolver, params.cert_verifier, params.channel_id_service,
       params.transport_security_state, params.cert_transparency_verifier,
       params.cert_policy_enforcer, params.ssl_session_cache_shard,
-      params.proxy_service, params.ssl_config_service,
-      params.enable_ssl_connect_job_waiting, params.proxy_delegate, pool_type);
+      params.ssl_config_service, params.enable_ssl_connect_job_waiting,
+      pool_type);
 }
 
 }  // unnamed namespace
@@ -91,6 +91,7 @@ HttpNetworkSession::Params::Params()
       quic_load_server_info_timeout_ms(0),
       quic_disable_loading_server_info_for_new_servers(false),
       quic_load_server_info_timeout_srtt_multiplier(0.0f),
+      quic_enable_truncated_connection_ids(false),
       quic_clock(NULL),
       quic_random(NULL),
       quic_max_packet_length(kDefaultMaxPacketSize),
@@ -136,6 +137,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
           params.quic_load_server_info_timeout_ms,
           params.quic_disable_loading_server_info_for_new_servers,
           params.quic_load_server_info_timeout_srtt_multiplier,
+          params.quic_enable_truncated_connection_ids,
           params.quic_connection_options),
       spdy_session_pool_(params.host_resolver,
                          params.ssl_config_service,