Deprecate gfe2_reloadable_flag_quic_retransmit_after_receiving_retry.
PiperOrigin-RevId: 355515198
Change-Id: I470b48ef276c3bab05c8f7da1c32f9919da0b7ea
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index df09b23..07834a8 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -959,9 +959,7 @@
// Reinstall initial crypters because the connection ID changed.
InstallInitialCrypters(server_connection_id_);
- if (GetQuicReloadableFlag(quic_retransmit_after_receiving_retry)) {
- sent_packet_manager_.MarkInitialPacketsForRetransmission();
- }
+ sent_packet_manager_.MarkInitialPacketsForRetransmission();
}
bool QuicConnection::HasIncomingConnectionId(QuicConnectionId connection_id) {
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 9ad044d..9b6943d 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -10188,7 +10188,6 @@
}
TEST_P(QuicConnectionTest, ClientRetransmitsInitialPacketsOnRetry) {
- SetQuicReloadableFlag(quic_retransmit_after_receiving_retry, true);
if (!connection_.version().HasIetfQuicFrames()) {
// TestClientRetryHandling() currently only supports IETF draft versions.
return;
@@ -10213,7 +10212,6 @@
}
TEST_P(QuicConnectionTest, NoInitialPacketsRetransmissionOnInvalidRetry) {
- SetQuicReloadableFlag(quic_retransmit_after_receiving_retry, true);
if (!connection_.version().HasIetfQuicFrames()) {
return;
}
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index ba92bd3..671b60e 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -49,7 +49,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_parse_accept_ch_frame, true)
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_retransmit_after_receiving_retry, true)
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)
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index f286de8..388a662 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -3972,7 +3972,6 @@
}
TEST_F(QuicSentPacketManagerTest, MarkInitialPacketsForRetransmission) {
- SetQuicReloadableFlag(quic_retransmit_after_receiving_retry, true);
SendCryptoPacket(1);
SendPingPacket(2, ENCRYPTION_HANDSHAKE);
// Only the INITIAL packet will be retransmitted.