Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/congestion_control/tcp_cubic_sender_bytes.cc

Index: net/quic/congestion_control/tcp_cubic_sender_bytes.cc
diff --git a/net/quic/congestion_control/tcp_cubic_sender_bytes.cc b/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
index 7b0341d720f8acfa4ea693613cc1ee48671fe84d..6280bb71938793531840535f10f6ee1ae068faa6 100644
--- a/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
+++ b/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
@@ -55,10 +55,12 @@ void TcpCubicSenderBytes::SetCongestionWindowFromBandwidthAndRtt(
     // Limit new CWND if needed.
     congestion_window_ =
         max(min_congestion_window_,
-            min(new_congestion_window, kMaxCongestionWindow * kDefaultTCPMSS));
+            min(new_congestion_window,
+                kMaxResumptionCongestionWindow * kDefaultTCPMSS));
   } else {
     congestion_window_ =
-        max(min(new_congestion_window, kMaxCongestionWindow * kDefaultTCPMSS),
+        max(min(new_congestion_window,
+                kMaxResumptionCongestionWindow * kDefaultTCPMSS),
             kMinCongestionWindowForBandwidthResumption * kDefaultTCPMSS);
   }
 }