Deprecate --gfe2_reloadable_flag_quic_bbr2_fewer_startup_round_trips.

PiperOrigin-RevId: 365572815
Change-Id: Iaf63e66f40166ae9d4db3cca76712f90dc43666a

quic/core/congestion_control/bbr2_sender.cc

diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc
index 96035ce..d9b1d95 100644
--- a/quic/core/congestion_control/bbr2_sender.cc
+++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -105,14 +105,10 @@
       config.HasClientRequestedIndependentOption(kB2CL, perspective)) {
     params_.avoid_too_low_probe_bw_cwnd = false;
   }
-  if (GetQuicReloadableFlag(quic_bbr2_fewer_startup_round_trips) &&
-      config.HasClientRequestedIndependentOption(k1RTT, perspective)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_fewer_startup_round_trips, 1, 2);
+  if (config.HasClientRequestedIndependentOption(k1RTT, perspective)) {
     params_.startup_full_bw_rounds = 1;
   }
-  if (GetQuicReloadableFlag(quic_bbr2_fewer_startup_round_trips) &&
-      config.HasClientRequestedIndependentOption(k2RTT, perspective)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_bbr2_fewer_startup_round_trips, 2, 2);
+  if (config.HasClientRequestedIndependentOption(k2RTT, perspective)) {
     params_.startup_full_bw_rounds = 2;
   }
   if (config.HasClientRequestedIndependentOption(kB2LO, perspective)) {

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 5e38495..827c589 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -13,7 +13,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_alps_include_scheme_in_origin, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_and_tls_allow_sni_without_dots, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_close_connection_with_too_many_outstanding_packets, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_connection_support_multiple_cids_v2, false)