Land Recent QUIC Changes.

net/quic/quic_client_session_test.cc

Index: net/quic/quic_client_session_test.cc
diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc
index f15e695dd08b654405ae0f53c7d8f495675106e3..6b4e8879574a289371c9cc82899d300299a2f7d1 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -72,13 +72,13 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
       : writer_(new TestPacketWriter(GetParam())),
         connection_(
             new PacketSavingConnection(false, SupportedVersions(GetParam()))),
-        session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL, NULL,
-                 make_scoped_ptr((QuicServerInfo*)NULL),
-                 QuicServerId(kServerHostname, kServerPort, false,
-                              PRIVACY_MODE_DISABLED),
-                 DefaultQuicConfig(), &crypto_config_,
+        session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL,
+                 make_scoped_ptr((QuicServerInfo*)NULL), DefaultQuicConfig(),
                  base::MessageLoop::current()->message_loop_proxy().get(),
                  &net_log_) {
+    session_.InitializeSession(QuicServerId(kServerHostname, kServerPort, false,
+                                            PRIVACY_MODE_DISABLED),
+                               &crypto_config_, NULL);
     session_.config()->SetDefaults();
     crypto_config_.SetDefaults();
   }