Deprecate gfe2_reloadable_flag_quic_abort_qpack_on_stream_close. PiperOrigin-RevId: 343880822 Change-Id: Iea113aefc40e0280a83ddc819e16640a6cd670ca
diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc index bdb5907..8e5cb1c 100644 --- a/quic/core/http/quic_spdy_stream.cc +++ b/quic/core/http/quic_spdy_stream.cc
@@ -807,10 +807,7 @@ void QuicSpdyStream::OnClose() { QuicStream::OnClose(); - if (GetQuicReloadableFlag(quic_abort_qpack_on_stream_close)) { - QUIC_RELOADABLE_FLAG_COUNT(quic_abort_qpack_on_stream_close); - qpack_decoded_headers_accumulator_.reset(); - } + qpack_decoded_headers_accumulator_.reset(); if (visitor_) { Visitor* visitor = visitor_;
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc index 74bc30c..38062ca 100644 --- a/quic/core/http/quic_spdy_stream_test.cc +++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -2486,26 +2486,10 @@ } stream_->Reset(QUIC_STREAM_CANCELLED); - if (!GetQuicReloadableFlag(quic_abort_qpack_on_stream_close) && - !GetQuicReloadableFlag(quic_abort_qpack_on_stream_reset)) { - // Header acknowledgement. - EXPECT_CALL(*session_, - WritevData(decoder_send_stream->id(), /* write_length = */ 1, - /* offset = */ 2, _, _, _)); - EXPECT_CALL(debug_visitor, OnHeadersDecoded(stream_->id(), _)); - } - // Deliver dynamic table entry to decoder. session_->qpack_decoder()->OnInsertWithoutNameReference("foo", "bar"); - if (GetQuicReloadableFlag(quic_abort_qpack_on_stream_close) || - GetQuicReloadableFlag(quic_abort_qpack_on_stream_reset)) { - EXPECT_FALSE(stream_->headers_decompressed()); - } else { - // Verify headers. - EXPECT_TRUE(stream_->headers_decompressed()); - EXPECT_THAT(stream_->header_list(), ElementsAre(Pair("foo", "bar"))); - } + EXPECT_FALSE(stream_->headers_decompressed()); } TEST_P(QuicSpdyStreamTest, HeaderDecodingUnblockedAfterResetReceived) {
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h index 881a371..7cb12d4 100644 --- a/quic/core/quic_flags_list.h +++ b/quic/core/quic_flags_list.h
@@ -5,7 +5,6 @@ // This file is autogenerated by the QUICHE Copybara export script. QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_use_fast_huffman_encoder, true) -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_abort_qpack_on_stream_close, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_abort_qpack_on_stream_reset, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_ack_delay_alarm_granularity, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)