Deprecate --gfe2_reloadable_flag_quic_bbr2_ignore_bad_rtt_sample.

PiperOrigin-RevId: 562837260

quiche/quic/core/congestion_control/bbr2_misc.cc

diff --git a/quiche/quic/core/congestion_control/bbr2_misc.cc b/quiche/quic/core/congestion_control/bbr2_misc.cc
index 0f601b5..f3306ec 100644
--- a/quiche/quic/core/congestion_control/bbr2_misc.cc
+++ b/quiche/quic/core/congestion_control/bbr2_misc.cc
@@ -42,8 +42,7 @@
       min_rtt_timestamp_(initial_min_rtt_timestamp) {}
 
 void MinRttFilter::Update(QuicTime::Delta sample_rtt, QuicTime now) {
-  if (ignore_bad_rtt_sample_ && sample_rtt <= QuicTime::Delta::Zero()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_ignore_bad_rtt_sample, 1, 2);
+  if (sample_rtt <= QuicTime::Delta::Zero()) {
     return;
   }
   if (sample_rtt < min_rtt_ || min_rtt_timestamp_ == QuicTime::Zero()) {
@@ -53,8 +52,7 @@
 }
 
 void MinRttFilter::ForceUpdate(QuicTime::Delta sample_rtt, QuicTime now) {
-  if (ignore_bad_rtt_sample_ && sample_rtt <= QuicTime::Delta::Zero()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_ignore_bad_rtt_sample, 2, 2);
+  if (sample_rtt <= QuicTime::Delta::Zero()) {
     return;
   }
   min_rtt_ = sample_rtt;

quiche/quic/core/congestion_control/bbr2_misc.h

diff --git a/quiche/quic/core/congestion_control/bbr2_misc.h b/quiche/quic/core/congestion_control/bbr2_misc.h
index 4eaae5d..8f0f8f6 100644
--- a/quiche/quic/core/congestion_control/bbr2_misc.h
+++ b/quiche/quic/core/congestion_control/bbr2_misc.h
@@ -264,8 +264,6 @@
   QuicTime::Delta min_rtt_;
   // Time when the current value of |min_rtt_| was assigned.
   QuicTime min_rtt_timestamp_;
-  const bool ignore_bad_rtt_sample_ =
-      GetQuicReloadableFlag(quic_bbr2_ignore_bad_rtt_sample);
 };
 
 class QUIC_EXPORT_PRIVATE Bbr2MaxBandwidthFilter {

quiche/quic/core/congestion_control/bbr2_simulator_test.cc

diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
index 82242ff..4a14fc7 100644
--- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -2588,24 +2588,14 @@
 
   filter.Update(QuicTime::Delta::FromMilliseconds(-1), time_in_seconds(150));
 
-  if (GetQuicReloadableFlag(quic_bbr2_ignore_bad_rtt_sample)) {
-    EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(10));
-    EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(100));
-  } else {
-    EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(-1));
-    EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(150));
-  }
+  EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(10));
+  EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(100));
 
   filter.ForceUpdate(QuicTime::Delta::FromMilliseconds(-2),
                      time_in_seconds(200));
 
-  if (GetQuicReloadableFlag(quic_bbr2_ignore_bad_rtt_sample)) {
-    EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(10));
-    EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(100));
-  } else {
-    EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(-2));
-    EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(200));
-  }
+  EXPECT_EQ(filter.Get(), QuicTime::Delta::FromMilliseconds(10));
+  EXPECT_EQ(filter.GetTimestamp(), time_in_seconds(100));
 }
 
 }  // namespace test

quiche/quic/core/quic_flags_list.h

diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 408fba4..689bbe9 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -23,8 +23,6 @@
 QUIC_FLAG(quic_reloadable_flag_quic_no_send_alarm_unless_necessary, false)
 // If true, HTTP/3 client will allow host header in HTTP/3 response.
 QUIC_FLAG(quic_reloadable_flag_quic_allow_host_header_in_response, true)
-// If true, QUIC BBR2 will ignore non-positive RTT samples.
-QUIC_FLAG(quic_reloadable_flag_quic_bbr2_ignore_bad_rtt_sample, true)
 // If true, QUIC server will not respond to gQUIC probing packet(PING + PADDING) but treat it as a regular packet.
 QUIC_FLAG(quic_reloadable_flag_quic_ignore_gquic_probing, true)
 // If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.