Land Recent QUIC Changes until 03/15/2015.

net/quic/quic_protocol.h

Index: net/quic/quic_protocol.h
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index 69b2ab41c00b627a34a62f1e0b2ebc6509cb03c2..e4ea75fc3e4fe7d2d86714ad088312cd995d87c8 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -69,14 +69,11 @@ const QuicPacketCount kInitialCongestionWindowInsecure = 20;
 // Minimum size of initial flow control window, for both stream and session.
 const uint32 kMinimumFlowControlSendWindow = 16 * 1024;  // 16 KB
 
-// Minimum and maximum size of the CWND, in packets,
-// when doing bandwidth resumption.
+// Minimum size of the CWND, in packets, when doing bandwidth resumption.
 const QuicPacketCount kMinCongestionWindowForBandwidthResumption = 10;
-const QuicPacketCount kMaxCongestionWindowForBandwidthResumption = 200;
 
-// Maximum number of tracked packets before the connection will be closed.
-// This effectively limits the max CWND to a smaller value than this.
-const QuicPacketCount kMaxTrackedPackets = 5000;
+// Maximum size of the CWND, in packets, for TCP congestion control algorithms.
+const QuicPacketCount kMaxTcpCongestionWindow = 200;
 
 // Default size of the socket receive buffer in bytes.
 const QuicByteCount kDefaultSocketReceiveBuffer = 256 * 1024;
@@ -755,7 +752,9 @@ void NET_EXPORT_PRIVATE InsertMissingPacketsBetween(
 // (Reno and Cubic are the classic example for that).
 enum CongestionControlType {
   kCubic,
+  kCubicBytes,
   kReno,
+  kRenoBytes,
   kBBR,
 };