Deprecate --gfe2_reloadable_flag_quic_send_goaway_with_connection_close. PiperOrigin-RevId: 359928956 Change-Id: Ib736421786e69695fd172d30f195a5ffbde7df52
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index b6750fe..e8a473f 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -1483,15 +1483,12 @@ } void QuicSpdySession::BeforeConnectionCloseSent() { - if (!GetQuicReloadableFlag(quic_send_goaway_with_connection_close) || - !VersionUsesHttp3(transport_version()) || !IsEncryptionEstablished()) { + if (!VersionUsesHttp3(transport_version()) || !IsEncryptionEstablished()) { return; } QUICHE_DCHECK_EQ(perspective(), Perspective::IS_SERVER); - QUIC_CODE_COUNT(quic_send_goaway_with_connection_close); - QuicStreamId stream_id = GetLargestPeerCreatedStreamId(/*unidirectional = */ false);
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index d231f78..2cf98ab 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -3112,13 +3112,11 @@ EXPECT_EQ(stream_id, QuicSessionPeer::GetLargestPeerCreatedStreamId( &session_, /*unidirectional = */ false)); - if (GetQuicReloadableFlag(quic_send_goaway_with_connection_close)) { - // Stream with stream_id is already received and potentially processed, - // therefore a GOAWAY frame is sent with the next stream ID. - EXPECT_CALL(debug_visitor, - OnGoAwayFrameSent( - stream_id + QuicUtils::StreamIdDelta(transport_version()))); - } + // Stream with stream_id is already received and potentially processed, + // therefore a GOAWAY frame is sent with the next stream ID. + EXPECT_CALL(debug_visitor, + OnGoAwayFrameSent(stream_id + + QuicUtils::StreamIdDelta(transport_version()))); // Close connection. EXPECT_CALL(*writer_, WritePacket(_, _, _, _, _))
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h index d2a66e0..7750948 100644 --- a/quic/core/quic_flags_list.h +++ b/quic/core/quic_flags_list.h
@@ -48,7 +48,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_h3_datagram, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_pass_path_response_to_validator, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_require_handshake_confirmation, false) -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_goaway_with_connection_close, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_path_response, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_timestamps, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_tls_crypto_error_code, true)