Land Recent QUIC changes.

net/quic/quic_session_test.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_session.h"
 
 #include <set>
 
 #include "base/hash_tables.h"
 #include "net/quic/crypto/crypto_handshake.h"
@@ skipping 42 matching lines @@
   virtual uint32 ProcessData(const char* data, uint32 data_len) {
     return data_len;
   }
 
   MOCK_METHOD0(OnCanWrite, void());
 };
 
 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 {
     return &crypto_stream_;
   }
 
   virtual TestStream* CreateOutgoingReliableStream() OVERRIDE {
     TestStream* stream = new TestStream(GetNextStreamId(), this);
     ActivateStream(stream);
     return stream;
@@ skipping 10 matching lines @@
   ReliableQuicStream* GetIncomingReliableStream(QuicStreamId stream_id) {
     return QuicSession::GetIncomingReliableStream(stream_id);
   }
 
   // Helper method for gmock
   void MarkTwoWriteBlocked() {
     this->MarkWriteBlocked(2);
   }
 
   TestCryptoStream crypto_stream_;
-  QuicConfig config_;
 };
 
 class QuicSessionTest : public ::testing::Test {
  protected:
   QuicSessionTest()
       : guid_(1),
         connection_(new MockConnection(guid_, IPEndPoint(), false)),
         session_(connection_, true) {
   }
 
@@ skipping 121 matching lines @@
               SendGoAway(QUIC_PEER_GOING_AWAY, 0u, "Going Away."));
   session_.SendGoAway(QUIC_PEER_GOING_AWAY, "Going Away.");
   EXPECT_TRUE(session_.goaway_sent());
 
   EXPECT_CALL(*connection_, SendRstStream(3u, QUIC_STREAM_PEER_GOING_AWAY));
   EXPECT_FALSE(session_.GetIncomingReliableStream(3u));
 }
 
 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
 }  // namespace test
 }  // namespace net