Land Recent QUIC Changes

net/quic/quic_crypto_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_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 using std::vector;
 
 namespace net {
 namespace test {
 namespace {
@@ skipping 16 matching lines @@
  private:
   vector<CryptoHandshakeMessage> messages_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuicCryptoStream);
 };
 
 class QuicCryptoStreamTest : public ::testing::Test {
  public:
   QuicCryptoStreamTest()
       : addr_(IPAddressNumber(), 1),
-        connection_(new MockConnection(1, addr_)),
+        connection_(new MockConnection(1, addr_, false)),
         session_(connection_, true),
         stream_(&session_) {
     message_.tag = kSHLO;
     message_.tag_value_map[1] = "abc";
     message_.tag_value_map[2] = "def";
     ConstructHandshakeMessage();
   }
 
   void ConstructHandshakeMessage() {
     CryptoFramer framer;
@@ skipping 38 matching lines @@
   bad[6] = 0x7F;  // out of order tag
 
   EXPECT_CALL(*connection_,
               SendConnectionClose(QUIC_CRYPTO_TAGS_OUT_OF_ORDER));
   EXPECT_EQ(0u, stream_.ProcessData(bad.data(), bad.length()));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net