Land Recent QUIC Changes

net/quic/quic_client_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_client_session.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
 #include "net/base/capturing_net_log.h"
@@ skipping 12 matching lines @@
 namespace test {
 namespace {
 
 const char kServerHostname[] = "www.example.com";
 
 class QuicClientSessionTest : public ::testing::Test {
  protected:
   QuicClientSessionTest()
       : guid_(1),
         connection_(new PacketSavingConnection(guid_, IPEndPoint(), false)),
-        session_(connection_, NULL, NULL, NULL, kServerHostname, &net_log_) {
+        session_(connection_, NULL, NULL, NULL, kServerHostname,
+                 &crypto_config_, &net_log_) {
+    crypto_config_.SetDefaults();
   }
 
   void CompleteCryptoHandshake() {
     ASSERT_EQ(ERR_IO_PENDING,
               session_.CryptoConnect(callback_.callback()));
     CryptoTestUtils::HandshakeWithFakeServer(
         connection_, session_.GetCryptoStream());
     ASSERT_EQ(OK, callback_.WaitForResult());
   }
 
   QuicGuid guid_;
   PacketSavingConnection* connection_;
   CapturingNetLog net_log_;
   QuicClientSession session_;
   MockClock clock_;
   MockRandom random_;
   QuicConnectionVisitorInterface* visitor_;
   TestCompletionCallback callback_;
+  QuicConfig* config_;
+  QuicCryptoClientConfig crypto_config_;
 };
 
 TEST_F(QuicClientSessionTest, CryptoConnect) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   CompleteCryptoHandshake();
 }
@@ skipping 100 matching lines @@
   ASSERT_TRUE(entries[pos].GetIntegerValue("error_code", &error_code));
   EXPECT_EQ(frame.error_code, static_cast<QuicRstStreamErrorCode>(error_code));
   std::string details;
   ASSERT_TRUE(entries[pos].GetStringValue("details", &details));
   EXPECT_EQ(frame.error_details, details);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net