Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: net/quic/quic_http_stream_test.cc

Issue 144063012: Fix a QUIC bug where previously undecryptable packets were not decrypted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload changes Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/quic_http_stream_test.cc
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index a49d6bbb7adcc9edf4d98e2d0beebd32b3dd7229..bbeafde223e6d6b3f6a72dd783d7c6886f276d8a 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -263,6 +263,15 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
sequence_number, !kIncludeVersion, stream_id_, QUIC_STREAM_CANCELLED);
}
+ scoped_ptr<QuicEncryptedPacket> ConstructAckAndRstStreamPacket(
+ QuicPacketSequenceNumber sequence_number,
Ryan Hamilton 2014/01/29 00:52:52 nit: Since the final 2 args are always 1, I'd remo
ramant (doing other things) 2014/01/29 02:45:38 Done.
+ QuicPacketSequenceNumber largest_received,
+ QuicPacketSequenceNumber least_unacked) {
+ return maker_.MakeAckAndRstPacket(
+ sequence_number, !kIncludeVersion, stream_id_, QUIC_STREAM_CANCELLED,
+ largest_received, least_unacked, !kIncludeCongestionFeedback);
+ }
+
scoped_ptr<QuicEncryptedPacket> ConstructAckPacket(
QuicPacketSequenceNumber sequence_number,
QuicPacketSequenceNumber largest_received,
@@ -611,7 +620,7 @@ TEST_P(QuicHttpStreamTest, DestroyedEarly) {
} else {
AddWrite(ConstructDataPacket(1, kIncludeVersion, kFin, 0, request_data_));
}
- AddWrite(ConstructRstStreamPacket(2));
+ AddWrite(ConstructAckAndRstStreamPacket(2, 1, 1));
use_closing_stream_ = true;
Initialize();
@@ -648,7 +657,7 @@ TEST_P(QuicHttpStreamTest, Priority) {
} else {
AddWrite(ConstructDataPacket(1, kIncludeVersion, kFin, 0, request_data_));
}
- AddWrite(ConstructRstStreamPacket(2));
+ AddWrite(ConstructAckAndRstStreamPacket(2, 1, 1));
use_closing_stream_ = true;
Initialize();

Powered by Google App Engine
This is Rietveld 408576698