Land Recent QUIC changes

net/tools/quic/test_tools/quic_test_utils.h

Index: net/tools/quic/test_tools/quic_test_utils.h
diff --git a/net/tools/quic/test_tools/quic_test_utils.h b/net/tools/quic/test_tools/quic_test_utils.h
index e4069c5878d8e4f2e7bb6e691a4ed4b501196028..fd69a1d1ac7495066c965a6142eebed8779ea2c9 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -9,6 +9,7 @@
 
 #include "base/strings/string_piece.h"
 #include "net/quic/quic_connection.h"
+#include "net/quic/quic_session.h"
 #include "net/quic/quic_spdy_decompressor.h"
 #include "net/spdy/spdy_framer.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -62,9 +63,7 @@ class MockConnection : public QuicConnection {
     return QuicConnection::ProcessUdpPacket(self_address, peer_address, packet);
   }
 
-  virtual bool OnProtocolVersionMismatch(QuicVersionTag version) {
-    return false;
-  }
+  virtual bool OnProtocolVersionMismatch(QuicTag version) { return false; }
 
  private:
   const bool has_mock_helper_;
@@ -83,6 +82,24 @@ class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
   std::string data_;
 };
 
+class TestSession : public QuicSession {
+ public:
+  TestSession(QuicConnection* connection, bool is_server);
+  virtual ~TestSession();
+
+  MOCK_METHOD1(CreateIncomingReliableStream,
+               ReliableQuicStream*(QuicStreamId id));
+  MOCK_METHOD0(CreateOutgoingReliableStream, ReliableQuicStream*());
+
+  void SetCryptoStream(QuicCryptoStream* stream);
+
+  virtual QuicCryptoStream* GetCryptoStream();
+
+ private:
+  QuicCryptoStream* crypto_stream_;
+  DISALLOW_COPY_AND_ASSIGN(TestSession);
+};
+
 }  // namespace test
 }  // namespace tools
 }  // namespace net