Land Recent QUIC changes.

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index 338caed5f1b9cd63658fa1fde23d8e269ca1f504..7ad64bfc5552a5639f2f0759119f8e2dc55650a6 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -60,9 +60,8 @@ class TestStream : public ReliableQuicStream {
 class TestSession : public QuicSession {
  public:
   TestSession(QuicConnection* connection, bool is_server)
-      : QuicSession(connection, QuicConfig(), is_server),
+      : QuicSession(connection, DefaultQuicConfig(), is_server),
         crypto_stream_(this) {
-    config()->SetDefaults();
   }
 
   virtual QuicCryptoStream* GetCryptoStream() OVERRIDE {
@@ -93,7 +92,6 @@ class TestSession : public QuicSession {
   }
 
   TestCryptoStream crypto_stream_;
-  QuicConfig config_;
 };
 
 class QuicSessionTest : public ::testing::Test {
@@ -235,11 +233,11 @@ TEST_F(QuicSessionTest, SendGoAway) {
 
 TEST_F(QuicSessionTest, IncreasedTimeoutAfterCryptoHandshake) {
   EXPECT_EQ(kDefaultInitialTimeoutSecs,
-            QuicConnectionPeer::GetTimeout(connection_).ToSeconds());
+            QuicConnectionPeer::GetNetworkTimeout(connection_).ToSeconds());
   CryptoHandshakeMessage msg;
   session_.crypto_stream_.OnHandshakeMessage(msg);
   EXPECT_EQ(kDefaultTimeoutSecs,
-            QuicConnectionPeer::GetTimeout(connection_).ToSeconds());
+            QuicConnectionPeer::GetNetworkTimeout(connection_).ToSeconds());
 }
 
 }  // namespace