Deprecate gfe2_reloadable_flag_quic_default_to_2_rttvar.
PiperOrigin-RevId: 344882968
Change-Id: Ib4e055688cc0c59ceee260145c4ff5c59edd04c8
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 530a077..c5d2a80 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -19,7 +19,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_on_pto, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_2_rttvar, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_bbr, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_bbr_v2, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_delay_initial_ack, true)
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 30ca57b..5927b14 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -1146,10 +1146,7 @@
max_probe_packets_per_pto_ = 1;
skip_packet_number_for_pto_ = true;
first_pto_srtt_multiplier_ = 1.5;
- if (GetQuicReloadableFlag(quic_default_to_2_rttvar)) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_default_to_2_rttvar);
- pto_rttvar_multiplier_ = 2;
- }
+ pto_rttvar_multiplier_ = 2;
}
void QuicSentPacketManager::StartExponentialBackoffAfterNthPto(
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index fdc7874..e087211 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -337,10 +337,7 @@
}
int GetPtoRttvarMultiplier() {
- if (GetQuicReloadableFlag(quic_default_on_pto)) {
- return 2;
- }
- if (GetQuicReloadableFlag(quic_default_to_2_rttvar) &&
+ if (GetQuicReloadableFlag(quic_default_on_pto) ||
manager_.handshake_mode_disabled()) {
return 2;
}
