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 10 matching lines @@
 namespace net {
 namespace test {
 namespace {
 
 const char kServerHostname[] = "www.example.com";
 
 class QuicClientSessionTest : public ::testing::Test {
  protected:
   QuicClientSessionTest()
       : guid_(1),
-        connection_(new PacketSavingConnection(guid_, IPEndPoint())),
+        connection_(new PacketSavingConnection(guid_, IPEndPoint(), false)),
         session_(connection_, NULL, NULL, kServerHostname, &net_log_) {
   }
 
   void CompleteCryptoHandshake() {
     ASSERT_EQ(ERR_IO_PENDING,
               session_.CryptoConnect(callback_.callback()));
     session_.GetCryptoStream()->OnHandshakeMessage(
         CreateShloMessage(&clock_, &random_, "www.google.com"));
     ASSERT_EQ(OK, callback_.WaitForResult());
 
@@ skipping 43 matching lines @@
   EXPECT_EQ(NULL, session_.CreateOutgoingReliableStream());
 }
 
 TEST_F(QuicClientSessionTest, Logging) {
   CompleteCryptoHandshake();
 
   // TODO(rch): Add some helper methods to simplify packet creation in tests.
   // Receive a packet, and verify that it was logged.
   QuicFramer framer(kQuicVersion1,
                     QuicDecrypter::Create(kNULL),
-                    QuicEncrypter::Create(kNULL));
+                    QuicEncrypter::Create(kNULL),
+                    false);
   QuicRstStreamFrame frame;
   frame.stream_id = 2;
   frame.error_code = QUIC_CONNECTION_TIMED_OUT;
   frame.error_details = "doh!";
 
   QuicFrames frames;
   frames.push_back(QuicFrame(&frame));
   QuicPacketHeader header;
   header.public_header.guid = 1;
   header.public_header.reset_flag = false;
@@ skipping 39 matching lines @@
   ASSERT_TRUE(entries[pos].GetIntegerValue("error_code", &error_code));
   EXPECT_EQ(frame.error_code, static_cast<QuicErrorCode>(error_code));
   std::string details;
   ASSERT_TRUE(entries[pos].GetStringValue("details", &details));
   EXPECT_EQ(frame.error_details, details);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net