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 "net/quic/quic_connection.h"
 
 #include <set>
 
 #include "base/hash_tables.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 base::hash_map;
 using std::set;
 using testing::_;
 using testing::InSequence;
 
 namespace net {
@@ skipping 59 matching lines @@
     this->MarkWriteBlocked(2);
   }
 
   TestCryptoStream crypto_stream_;
 };
 
 class QuicSessionTest : public ::testing::Test {
  protected:
   QuicSessionTest()
       : guid_(1),
-        connection_(new MockConnection(guid_, IPEndPoint())),
+        connection_(new MockConnection(guid_, IPEndPoint(), false)),
         session_(connection_, true) {
   }
 
   void CheckClosedStreams() {
     for (int i = kCryptoStreamId; i < 100; i++) {
       if (closed_streams_.count(i) == 0) {
         EXPECT_FALSE(session_.IsClosedStream(i)) << " stream id: " << i;
       } else {
         EXPECT_TRUE(session_.IsClosedStream(i)) << " stream id: " << i;
       }
@@ skipping 104 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_PEER_GOING_AWAY));
   EXPECT_FALSE(session_.GetIncomingReliableStream(3u));
 }
 }  // namespace
 }  // namespace test
 }  // namespace net