commit 3e0b9e51416144142b464c419e7cf084e17cee9f
author wub <wub@google.com> Thu Jul 09 10:58:13 2020 -0400
committer Victor Vasiliev <vasilvv@google.com> Thu Jul 09 14:38:31 2020 -0400
tree 70f68e4e639058de4b5453e1732cde53247ddd24
parent 70738bbd5859f86c988818ea60615df9275a5cda

(n/a) deprecate --quic_bbr2_add_ack_height_to_queueing_threshold.

PiperOrigin-RevId: 320396357
Change-Id: I0eefc0623719bece84ee1cce113d00f41a7a613e

quic/core/congestion_control/bbr2_misc.h

diff --git a/quic/core/congestion_control/bbr2_misc.h b/quic/core/congestion_control/bbr2_misc.h
index ddef772..cd89e6c 100644
--- a/quic/core/congestion_control/bbr2_misc.h
+++ b/quic/core/congestion_control/bbr2_misc.h
@@ -172,8 +172,7 @@
   bool flexible_app_limited = false;
 
   // Can be disabled by connection option 'B2NA'.
-  bool add_ack_height_to_queueing_threshold =
-      GetQuicReloadableFlag(quic_bbr2_add_ack_height_to_queueing_threshold);
+  bool add_ack_height_to_queueing_threshold = true;
 
   // Can be disabled by connection option 'B2RP'.
   bool avoid_unnecessary_probe_rtt = true;

quic/core/congestion_control/bbr2_probe_bw.cc

diff --git a/quic/core/congestion_control/bbr2_probe_bw.cc b/quic/core/congestion_control/bbr2_probe_bw.cc
index f6a0938..59e6303 100644
--- a/quic/core/congestion_control/bbr2_probe_bw.cc
+++ b/quic/core/congestion_control/bbr2_probe_bw.cc
@@ -431,8 +431,6 @@
     const QuicByteCount bdp = model_->BDP(model_->MaxBandwidth());
     QuicByteCount queuing_threshold_extra_bytes = 2 * kDefaultTCPMSS;
     if (Params().add_ack_height_to_queueing_threshold) {
-      QUIC_RELOADABLE_FLAG_COUNT(
-          quic_bbr2_add_ack_height_to_queueing_threshold);
       queuing_threshold_extra_bytes += model_->MaxAckHeight();
     }
     QuicByteCount queuing_threshold =