Landing Recent QUIC changes until Mon May 8 21:42:46 2017 +0000

net/quic/core/congestion_control/bbr_sender.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/congestion_control/bbr_sender.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "net/quic/core/congestion_control/rtt_stats.h"
@@ skipping 315 matching lines @@
 }
 
 QuicTime::Delta BbrSender::GetMinRtt() const {
   return !min_rtt_.IsZero()
              ? min_rtt_
              : QuicTime::Delta::FromMicroseconds(rtt_stats_->initial_rtt_us());
 }
 
 QuicByteCount BbrSender::GetTargetCongestionWindow(float gain) const {
   QuicByteCount bdp = GetMinRtt() * BandwidthEstimate();
-  if (FLAGS_quic_reloadable_flag_quic_bbr_base_cwnd_on_srtt &&
-      mode_ == PROBE_BW && gain >= 1 && !rtt_stats_->smoothed_rtt().IsZero()) {
-    bdp = rtt_stats_->smoothed_rtt() * BandwidthEstimate();
-  }
   QuicByteCount congestion_window = gain * bdp;
 
   // BDP estimate will be zero if no bandwidth samples are available yet.
   if (congestion_window == 0) {
     congestion_window = gain * initial_congestion_window_;
   }
 
   return std::max(congestion_window, kMinimumCongestionWindow);
 }
 
@@ skipping 480 matching lines @@
   os << "Minimum RTT timestamp: " << state.min_rtt_timestamp.ToDebuggingValue()
      << std::endl;
 
   os << "Last sample is app-limited: "
      << (state.last_sample_is_app_limited ? "yes" : "no");
 
   return os;
 }
 
 }  // namespace net