Land Recent QUIC changes.

net/quic/quic_stream_factory.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/quic/quic_stream_factory.h"
 
 #include <set>
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 208 matching lines @@
     ClientSocketFactory* client_socket_factory,
     QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
     QuicRandom* random_generator,
     QuicClock* clock)
     : host_resolver_(host_resolver),
       client_socket_factory_(client_socket_factory),
       quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
       random_generator_(random_generator),
       clock_(clock),
       weak_factory_(this) {
+  config_.SetDefaults();
+  config_.set_idle_connection_state_lifetime(
+      QuicTime::Delta::FromSeconds(30),
+      QuicTime::Delta::FromSeconds(30));
 }
 
 QuicStreamFactory::~QuicStreamFactory() {
   STLDeleteElements(&all_sessions_);
   STLDeleteValues(&active_jobs_);
   STLDeleteValues(&all_crypto_configs_);
 }
 
 int QuicStreamFactory::Create(const HostPortProxyPair& host_port_proxy_pair,
                               const BoundNetLog& net_log,
@@ skipping 140 matching lines @@
 
   QuicConnection* connection = new QuicConnection(guid, addr, helper, false);
 
   QuicCryptoClientConfig* crypto_config =
       GetOrCreateCryptoConfig(host_port_proxy_pair);
   DCHECK(crypto_config);
 
   QuicClientSession* session =
       new QuicClientSession(connection, socket, this,
                             quic_crypto_client_stream_factory_,
-                            host_port_proxy_pair.first.host(), QuicConfig(),
+                            host_port_proxy_pair.first.host(), config_,
                             crypto_config, net_log.net_log());
-  session->config()->SetDefaults();
-  session->config()->set_idle_connection_state_lifetime(
-      QuicTime::Delta::FromSeconds(30),
-      QuicTime::Delta::FromSeconds(30));
   all_sessions_.insert(session);  // owning pointer
   return session;
 }
 
 bool QuicStreamFactory::HasActiveJob(
     const HostPortProxyPair& host_port_proxy_pair) {
   return ContainsKey(active_jobs_, host_port_proxy_pair);
 }
 
 void QuicStreamFactory::ActivateSession(
@@ skipping 12 matching lines @@
     DCHECK(crypto_config);
   } else {
     crypto_config = new QuicCryptoClientConfig();
     crypto_config->SetDefaults();
     all_crypto_configs_[host_port_proxy_pair] = crypto_config;
   }
   return crypto_config;
 }
 
 }  // namespace net