Update from https://crrev.com/311076

net/http/http_network_session.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/http/http_network_session.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
@@ skipping 26 matching lines @@
     const net::HttpNetworkSession::Params& params) {
   // TODO(yutak): Differentiate WebSocket pool manager and allow more
   // simultaneous connections for WebSockets.
   return new net::ClientSocketPoolManagerImpl(
       params.net_log, params.client_socket_factory
                           ? params.client_socket_factory
                           : net::ClientSocketFactory::GetDefaultFactory(),
       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
 
 namespace net {
 
 HttpNetworkSession::Params::Params()
     : client_socket_factory(NULL),
       host_resolver(NULL),
       cert_verifier(NULL),
@@ skipping 25 matching lines @@
       force_spdy_always(false),
       use_alternate_protocols(false),
       alternate_protocol_probability_threshold(1),
       enable_quic(false),
       enable_quic_port_selection(true),
       quic_always_require_handshake_confirmation(false),
       quic_disable_connection_pooling(false),
       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),
       enable_user_alternate_protocol_ports(false),
       quic_crypto_client_stream_factory(NULL),
       proxy_delegate(NULL) {
   quic_supported_versions.push_back(QUIC_VERSION_23);
 }
 
 HttpNetworkSession::Params::~Params() {}
@@ skipping 25 matching lines @@
           params.quic_clock ? params.quic_clock : new QuicClock(),
           params.quic_max_packet_length,
           params.quic_user_agent_id,
           params.quic_supported_versions,
           params.enable_quic_port_selection,
           params.quic_always_require_handshake_confirmation,
           params.quic_disable_connection_pooling,
           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,
                          params.http_server_properties,
                          params.transport_security_state,
                          params.force_spdy_single_domain,
                          params.enable_spdy_compression,
                          params.enable_spdy_ping_based_connection_checking,
                          params.spdy_default_protocol,
                          params.spdy_stream_initial_recv_window_size,
@@ skipping 162 matching lines @@
     case WEBSOCKET_SOCKET_POOL:
       return websocket_socket_pool_manager_.get();
     default:
       NOTREACHED();
       break;
   }
   return NULL;
 }
 
 }  //  namespace net