| 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 412bd23ef2aabe08547d759d416fdfaa2cc29dbd..e9f3845ece04eca15f2837d5fd45e4d881e34f56 100644
|
| --- a/net/quic/quic_http_stream_test.cc
|
| +++ b/net/quic/quic_http_stream_test.cc
|
| @@ -23,6 +23,7 @@
|
| #include "net/quic/quic_connection.h"
|
| #include "net/quic/quic_connection_helper.h"
|
| #include "net/quic/quic_default_packet_writer.h"
|
| +#include "net/quic/quic_flags.h"
|
| #include "net/quic/quic_http_utils.h"
|
| #include "net/quic/quic_reliable_client_stream.h"
|
| #include "net/quic/quic_write_blocked_list.h"
|
| @@ -274,6 +275,12 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
|
| AdjustErrorForVersion(QUIC_RST_ACKNOWLEDGEMENT, GetParam()));
|
| }
|
|
|
| + scoped_ptr<QuicEncryptedPacket> ConstructRstStreamCancelledPacket(
|
| + QuicPacketSequenceNumber sequence_number) {
|
| + return maker_.MakeRstPacket(sequence_number, !kIncludeVersion, stream_id_,
|
| + QUIC_STREAM_CANCELLED);
|
| + }
|
| +
|
| scoped_ptr<QuicEncryptedPacket> ConstructAckAndRstStreamPacket(
|
| QuicPacketSequenceNumber sequence_number) {
|
| return maker_.MakeAckAndRstPacket(
|
| @@ -663,7 +670,11 @@ TEST_P(QuicHttpStreamTest, SendChunkedPostRequestWithOneEmptyDataPacket) {
|
| TEST_P(QuicHttpStreamTest, DestroyedEarly) {
|
| SetRequest("GET", "/", DEFAULT_PRIORITY);
|
| AddWrite(ConstructRequestHeadersPacket(1, kFin, DEFAULT_PRIORITY));
|
| - AddWrite(ConstructAckAndRstStreamPacket(2));
|
| + if (FLAGS_quic_process_frames_inline) {
|
| + AddWrite(ConstructRstStreamCancelledPacket(2));
|
| + } else {
|
| + AddWrite(ConstructAckAndRstStreamPacket(2));
|
| + }
|
| use_closing_stream_ = true;
|
| Initialize();
|
|
|
| @@ -691,7 +702,11 @@ TEST_P(QuicHttpStreamTest, DestroyedEarly) {
|
| TEST_P(QuicHttpStreamTest, Priority) {
|
| SetRequest("GET", "/", MEDIUM);
|
| AddWrite(ConstructRequestHeadersPacket(1, kFin, MEDIUM));
|
| - AddWrite(ConstructAckAndRstStreamPacket(2));
|
| + if (FLAGS_quic_process_frames_inline) {
|
| + AddWrite(ConstructRstStreamCancelledPacket(2));
|
| + } else {
|
| + AddWrite(ConstructAckAndRstStreamPacket(2));
|
| + }
|
| use_closing_stream_ = true;
|
| Initialize();
|
|
|
|
|