commit b43f4d80633c5f2e6a371b0d2311ab0a10b7b284
author ianswett <ianswett@google.com> Fri Oct 16 15:00:40 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Oct 16 15:01:15 2020 -0700
tree 925d5492c410baa32c733c47c63ed2cabbce57a4
parent d074485be5df6eceefee5f8787e215574f61ab4f

Deprecate gfe2_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery false now that it's been rolled back.

PiperOrigin-RevId: 337584435
Change-Id: I86ea1a46c57ae6791b45ca43d053c2067a093f2f

quic/core/congestion_control/bbr_sender.cc

diff --git a/quic/core/congestion_control/bbr_sender.cc b/quic/core/congestion_control/bbr_sender.cc
index 2948272..d43b680 100644
--- a/quic/core/congestion_control/bbr_sender.cc
+++ b/quic/core/congestion_control/bbr_sender.cc
@@ -814,15 +814,11 @@
   // Instead of immediately setting the target CWND as the new one, BBR grows
   // the CWND towards |target_window| by only increasing it |bytes_acked| at a
   // time.
-  const bool add_bytes_acked =
-      !GetQuicReloadableFlag(quic_bbr_no_bytes_acked_in_startup_recovery) ||
-      !InRecovery();
   if (is_at_full_bandwidth_) {
     congestion_window_ =
         std::min(target_window, congestion_window_ + bytes_acked);
-  } else if (add_bytes_acked &&
-             (congestion_window_ < target_window ||
-              sampler_.total_bytes_acked() < initial_congestion_window_)) {
+  } else if (congestion_window_ < target_window ||
+             sampler_.total_bytes_acked() < initial_congestion_window_) {
     // If the connection is not yet out of startup phase, do not decrease the
     // window.
     congestion_window_ = congestion_window_ + bytes_acked;