Deprecate --gfe2_reloadable_flag_quic_bbr2_ignore_inflight_hi_in_probe_up.
PiperOrigin-RevId: 476087385
diff --git a/quiche/quic/core/congestion_control/bbr2_sender.cc b/quiche/quic/core/congestion_control/bbr2_sender.cc
index 2ea2f8d..4abe297 100644
--- a/quiche/quic/core/congestion_control/bbr2_sender.cc
+++ b/quiche/quic/core/congestion_control/bbr2_sender.cc
@@ -176,9 +176,7 @@
ContainsQuicTag(connection_options, kB202)) {
params_.probe_up_dont_exit_if_no_queue_ = true;
}
- if (GetQuicReloadableFlag(quic_bbr2_ignore_inflight_hi_in_probe_up) &&
- ContainsQuicTag(connection_options, kB203)) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_bbr2_ignore_inflight_hi_in_probe_up);
+ if (ContainsQuicTag(connection_options, kB203)) {
params_.probe_up_ignore_inflight_hi = true;
}
if (GetQuicReloadableFlag(quic_bbr2_startup_extra_acked) &&
diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
index a17dd56..056dcb7 100644
--- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -934,7 +934,6 @@
// Test Bbr2's reaction to a 100x bandwidth increase during a transfer with B203
TEST_F(Bbr2DefaultTopologyTest, QUIC_SLOW_TEST(BandwidthIncreaseB203)) {
- SetQuicReloadableFlag(quic_bbr2_ignore_inflight_hi_in_probe_up, true);
SetConnectionOption(kB203);
DefaultTopologyParams params;
params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000);
@@ -968,7 +967,6 @@
// in the presence of ACK aggregation.
TEST_F(Bbr2DefaultTopologyTest,
QUIC_SLOW_TEST(BandwidthIncreaseB203Aggregation)) {
- SetQuicReloadableFlag(quic_bbr2_ignore_inflight_hi_in_probe_up, true);
SetConnectionOption(kB203);
DefaultTopologyParams params;
params.local_link.bandwidth = QuicBandwidth::FromKBitsPerSecond(15000);
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 0a09a9c..0979687 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -97,8 +97,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_unified_iw_options, true)
// When true, support draft-ietf-quic-v2-01
QUIC_FLAG(quic_reloadable_flag_quic_enable_version_2_draft_01, false)
-// When true, the B203 connection option causes the Bbr2Sender to ignore inflight_hi during PROBE_UP and increase it when the bytes delivered without loss are higher.
-QUIC_FLAG(quic_reloadable_flag_quic_bbr2_ignore_inflight_hi_in_probe_up, true)
// When true, the B205 connection option enables extra acked in STARTUP, and B204 adds new logic to decrease it whenever max bandwidth increases.
QUIC_FLAG(quic_reloadable_flag_quic_bbr2_startup_extra_acked, true)
// When true, the BBR4 copt sets the extra_acked window to 20 RTTs and BBR5 sets it to 40 RTTs.
