Move QuicServerInfo management from CachedState to the QuicStreamFactory

net/quic/quic_client_session.cc

Index: net/quic/quic_client_session.cc
diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc
index d8d9a19c220f2df7994d0f625fc6f5a8f1935697..0bc6132eb50df7be7114c9f78aef457d94aa2ac5 100644
--- a/net/quic/quic_client_session.cc
+++ b/net/quic/quic_client_session.cc
@@ -13,6 +13,7 @@
 #include "base/values.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/quic/crypto/quic_server_info.h"
 #include "net/quic/quic_connection_helper.h"
 #include "net/quic/quic_crypto_client_stream_factory.h"
 #include "net/quic/quic_default_packet_writer.h"
@@ -85,6 +86,7 @@ QuicClientSession::QuicClientSession(
     scoped_ptr<DatagramClientSocket> socket,
     scoped_ptr<QuicDefaultPacketWriter> writer,
     QuicStreamFactory* stream_factory,
+    scoped_ptr<QuicServerInfo> server_info,
     QuicCryptoClientStreamFactory* crypto_client_stream_factory,
     const string& server_hostname,
     const QuicConfig& config,
@@ -108,6 +110,8 @@ QuicClientSession::QuicClientSession(
               server_hostname, this, crypto_config) :
           new QuicCryptoClientStream(server_hostname, this, crypto_config));
 
+  crypto_stream_->SetQuicServerInfo(server_info.Pass());
+
   connection->set_debug_visitor(&logger_);
   // TODO(rch): pass in full host port proxy pair
   net_log_.BeginEvent(