1 files changed, 28 insertions, 5 deletions
diff --git a/chromium/net/quic/test_tools/quic_test_utils.cc b/chromium/net/quic/test_tools/quic_test_utils.cc
index c3546dfc861..60a70cca68a 100644
--- a/chromium/net/quic/test_tools/quic_test_utils.cc
+++ b/chromium/net/quic/test_tools/quic_test_utils.cc
@@ -233,6 +233,10 @@ bool NoOpFramerVisitor::OnBlockedFrame(const QuicBlockedFrame& frame) {
   return true;
 }
 
+bool NoOpFramerVisitor::IsValidStatelessResetToken(uint128 token) const {
+  return false;
+}
+
 MockQuicConnectionVisitor::MockQuicConnectionVisitor() {}
 
 MockQuicConnectionVisitor::~MockQuicConnectionVisitor() {}
@@ -374,9 +378,14 @@ void PacketSavingConnection::SendOrQueuePacket(SerializedPacket* packet) {
 }
 
 MockQuicSession::MockQuicSession(QuicConnection* connection)
+    : MockQuicSession(connection, true) {}
+
+MockQuicSession::MockQuicSession(QuicConnection* connection,
+                                 bool create_mock_crypto_stream)
     : QuicSession(connection, nullptr, DefaultQuicConfig()) {
-  crypto_stream_ = QuicMakeUnique<MockQuicCryptoStream>(this);
-  Initialize();
+  if (create_mock_crypto_stream) {
+    crypto_stream_ = QuicMakeUnique<MockQuicCryptoStream>(this);
+  }
   ON_CALL(*this, WritevData(_, _, _, _, _))
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }
@@ -393,6 +402,10 @@ const QuicCryptoStream* MockQuicSession::GetCryptoStream() const {
   return crypto_stream_.get();
 }
 
+void MockQuicSession::SetCryptoStream(QuicCryptoStream* crypto_stream) {
+  crypto_stream_.reset(crypto_stream);
+}
+
 // static
 QuicConsumedData MockQuicSession::ConsumeData(QuicStream* stream,
                                               QuicStreamId /*id*/,
@@ -432,9 +445,15 @@ CryptoMessageParser* MockQuicCryptoStream::crypto_message_parser() {
 }
 
 MockQuicSpdySession::MockQuicSpdySession(QuicConnection* connection)
+    : MockQuicSpdySession(connection, true) {}
+
+MockQuicSpdySession::MockQuicSpdySession(QuicConnection* connection,
+                                         bool create_mock_crypto_stream)
     : QuicSpdySession(connection, nullptr, DefaultQuicConfig()) {
-  crypto_stream_ = QuicMakeUnique<MockQuicCryptoStream>(this);
-  Initialize();
+  if (create_mock_crypto_stream) {
+    crypto_stream_ = QuicMakeUnique<MockQuicCryptoStream>(this);
+  }
+
   ON_CALL(*this, WritevData(_, _, _, _, _))
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }
@@ -451,6 +470,10 @@ const QuicCryptoStream* MockQuicSpdySession::GetCryptoStream() const {
   return crypto_stream_.get();
 }
 
+void MockQuicSpdySession::SetCryptoStream(QuicCryptoStream* crypto_stream) {
+  crypto_stream_.reset(crypto_stream);
+}
+
 size_t MockQuicSpdySession::WriteHeaders(
     QuicStreamId id,
     SpdyHeaderBlock headers,
@@ -642,7 +665,7 @@ QuicEncryptedPacket* ConstructEncryptedPacket(QuicConnectionId connection_id,
                                               const string& data) {
   return ConstructEncryptedPacket(
       connection_id, version_flag, reset_flag, packet_number, data,
-      PACKET_8BYTE_CONNECTION_ID, PACKET_6BYTE_PACKET_NUMBER);
+      PACKET_8BYTE_CONNECTION_ID, PACKET_4BYTE_PACKET_NUMBER);
 }
 
 QuicEncryptedPacket* ConstructEncryptedPacket(