Deprecate gfe2_reloadable_flag_quic_bbr2_fix_bw_lo_mode2.
PiperOrigin-RevId: 384235289
diff --git a/quic/core/congestion_control/bbr2_misc.cc b/quic/core/congestion_control/bbr2_misc.cc
index 78f5731..6eb9b2e 100644
--- a/quic/core/congestion_control/bbr2_misc.cc
+++ b/quic/core/congestion_control/bbr2_misc.cc
@@ -264,9 +264,7 @@
// sample_max_bandwidth will be Zero() if the loss is triggered by a timer
// expiring. Ideally we'd use the most recent bandwidth sample,
// but bandwidth_latest is safer than Zero().
- if (GetQuicReloadableFlag(quic_bbr2_fix_bw_lo_mode2) &&
- !congestion_event.sample_max_bandwidth.IsZero()) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_fix_bw_lo_mode2, 1, 2);
+ if (!congestion_event.sample_max_bandwidth.IsZero()) {
// bandwidth_latest_ is the max bandwidth for the round, but to allow
// fast, conservation style response to loss, use the last sample.
last_bandwidth = congestion_event.sample_max_bandwidth;
diff --git a/quic/core/congestion_control/bbr2_probe_bw.cc b/quic/core/congestion_control/bbr2_probe_bw.cc
index 786af0f..ce9443f 100644
--- a/quic/core/congestion_control/bbr2_probe_bw.cc
+++ b/quic/core/congestion_control/bbr2_probe_bw.cc
@@ -476,9 +476,7 @@
cycle_.rounds_in_phase = 0;
cycle_.phase_start_time = now;
++sender_->connection_stats_->bbr_num_cycles;
- if (GetQuicReloadableFlag(quic_bbr2_fix_bw_lo_mode2) &&
- Params().bw_lo_mode_ != Bbr2Params::QuicBandwidthLoMode::DEFAULT) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_fix_bw_lo_mode2, 2, 2);
+ if (Params().bw_lo_mode_ != Bbr2Params::QuicBandwidthLoMode::DEFAULT) {
// Clear bandwidth lo if it was set in PROBE_UP, because losses in PROBE_UP
// should not permanently change bandwidth_lo.
// It's possible for bandwidth_lo to be set during REFILL, but if that was
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index ff44d6a..69f04ea 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -17,8 +17,6 @@
QUIC_FLAG(FLAGS_quic_restart_flag_quic_testonly_default_false, false)
// A testonly restart flag that will always default to true.
QUIC_FLAG(FLAGS_quic_restart_flag_quic_testonly_default_true, true)
-// Fix QUIC BBRv2\'s bandwidth_lo modes to better approximate packet conservation.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_fix_bw_lo_mode2, true)
// If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
// If true, QuicGsoBatchWriter will support release time if it is available and the process has the permission to do so.
