Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/congestion_control/tcp_cubic_sender_packets.cc

Index: net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
index c89895a98dee105067526b511333d6138b88f1d4..3cbeb9df94b2472406da46a89ccd1f6b19f328bc 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_packets.cc
@@ -51,16 +51,10 @@ void TcpCubicSenderPackets::SetCongestionWindowFromBandwidthAndRtt(
     QuicTime::Delta rtt) {
   QuicPacketCount new_congestion_window =
       bandwidth.ToBytesPerPeriod(rtt) / kDefaultTCPMSS;
-  if (FLAGS_quic_no_lower_bw_resumption_limit) {
-    // Limit new CWND to be in the range [1, kMaxCongestionWindow].
-    congestion_window_ =
-        max(min_congestion_window_,
-            min(new_congestion_window, kMaxResumptionCongestionWindow));
-  } else {
-    congestion_window_ =
-        max(min(new_congestion_window, kMaxResumptionCongestionWindow),
-            kMinCongestionWindowForBandwidthResumption);
-  }
+  // Limit new CWND to be in the range [1, kMaxCongestionWindow].
+  congestion_window_ =
+      max(min_congestion_window_,
+          min(new_congestion_window, kMaxResumptionCongestionWindow));
 }
 
 void TcpCubicSenderPackets::SetCongestionWindowInPackets(