Landing Recent QUIC changes until Fri May 12 18:23:26 2017 +0000

net/quic/core/congestion_control/bbr_sender.cc

Index: net/quic/core/congestion_control/bbr_sender.cc
diff --git a/net/quic/core/congestion_control/bbr_sender.cc b/net/quic/core/congestion_control/bbr_sender.cc
index c36a771377c0eb3a07055dfbe54cc81d80dad779..5afad718ca0f3165f6af3cb1232c25274e8a7611 100644
--- a/net/quic/core/congestion_control/bbr_sender.cc
+++ b/net/quic/core/congestion_control/bbr_sender.cc
@@ -221,14 +221,11 @@ bool BbrSender::InRecovery() const {
 
 void BbrSender::SetFromConfig(const QuicConfig& config,
                               Perspective perspective) {
-  if (FLAGS_quic_reloadable_flag_quic_allow_2_rtt_bbr_startup) {
-    QUIC_FLAG_COUNT(quic_reloadable_flag_quic_allow_2_rtt_bbr_startup);
-    if (config.HasClientRequestedIndependentOption(k1RTT, perspective)) {
-      num_startup_rtts_ = 1;
-    }
-    if (config.HasClientRequestedIndependentOption(k2RTT, perspective)) {
-      num_startup_rtts_ = 2;
-    }
+  if (config.HasClientRequestedIndependentOption(k1RTT, perspective)) {
+    num_startup_rtts_ = 1;
+  }
+  if (config.HasClientRequestedIndependentOption(k2RTT, perspective)) {
+    num_startup_rtts_ = 2;
   }
 }