Land Recent QUIC changes.

net/quic/quic_crypto_client_stream_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_crypto_client_stream.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
+#include "net/quic/quic_protocol.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
@@ skipping 22 matching lines @@
   bool frame_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(TestQuicVisitor);
 };
 
 class QuicCryptoClientStreamTest : public ::testing::Test {
  public:
   QuicCryptoClientStreamTest()
       : addr_(),
         connection_(new PacketSavingConnection(1, addr_, true)),
-        session_(connection_, true),
-        stream_(kServerHostname, config_, &session_, &crypto_config_) {
+        session_(connection_, QuicConfig(), true),
+        stream_(kServerHostname, &session_, &crypto_config_) {
     session_.SetCryptoStream(&stream_);
-    config_.SetDefaults();
+    session_.config()->SetDefaults();
     crypto_config_.SetDefaults();
   }
 
   void CompleteCryptoHandshake() {
     EXPECT_TRUE(stream_.CryptoConnect());
     CryptoTestUtils::HandshakeWithFakeServer(connection_, &stream_);
   }
 
   void ConstructHandshakeMessage() {
     CryptoFramer framer;
     message_data_.reset(framer.ConstructHandshakeMessage(message_));
   }
 
   IPEndPoint addr_;
   PacketSavingConnection* connection_;
   TestSession session_;
   QuicCryptoClientStream stream_;
   CryptoHandshakeMessage message_;
   scoped_ptr<QuicData> message_data_;
-  QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;
 };
 
 TEST_F(QuicCryptoClientStreamTest, NotInitiallyConected) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   EXPECT_FALSE(stream_.encryption_established());
@@ skipping 43 matching lines @@
 }
 
 TEST_F(QuicCryptoClientStreamTest, NegotiatedParameters) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   CompleteCryptoHandshake();
 
-  const QuicNegotiatedParameters& params(stream_.negotiated_params());
-  EXPECT_EQ(kQBIC, params.congestion_control);
-  EXPECT_EQ(300, params.idle_connection_state_lifetime.ToSeconds());
-  EXPECT_EQ(0, params.keepalive_timeout.ToSeconds());
+  const QuicConfig* config = session_.config();
+  EXPECT_EQ(kQBIC, config->congestion_control());
+  EXPECT_EQ(kDefaultTimeoutSecs,
+            config->idle_connection_state_lifetime().ToSeconds());
+  EXPECT_EQ(kDefaultMaxStreamsPerConnection,
+            config->max_streams_per_connection());
+  EXPECT_EQ(0, config->keepalive_timeout().ToSeconds());
 
   const QuicCryptoNegotiatedParameters& crypto_params(
       stream_.crypto_negotiated_params());
   EXPECT_EQ(kAESG, crypto_params.aead);
   EXPECT_EQ(kC255, crypto_params.key_exchange);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net