Update from https://crrev.com/306655

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 4cd53a9449a7a220caeb703cc4a451a99f1d3c51..d5b8d1bb5cff4ba4f1bf8ca84c7cde00d96f5a03 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -59,8 +59,6 @@ const QuicByteCount kMaxPacketSize = 1452;
 // Default maximum packet size used in Linux TCP implementations.
 const QuicByteCount kDefaultTCPMSS = 1460;
 
-// Maximum size of the initial congestion window in packets.
-const QuicPacketCount kMaxInitialWindow = 100;
 // We match SPDY's use of 32 when secure (since we'd compete with SPDY).
 const QuicPacketCount kInitialCongestionWindowSecure = 32;
 // Be conservative, and just use double a typical TCP ICWND for HTTP.
@@ -69,9 +67,11 @@ const QuicPacketCount kInitialCongestionWindowInsecure = 20;
 // Default size of initial flow control window, for both stream and session.
 const uint32 kDefaultFlowControlSendWindow = 16 * 1024;  // 16 KB
 
-// Maximum size of the congestion window, in packets, for TCP congestion control
-// algorithms.
-const size_t kMaxTcpCongestionWindow = 200;
+// Minimum size of the CWND, in packets, when doing bandwidth resumption.
+const QuicPacketCount kMinCongestionWindowForBandwidthResumption = 10;
+
+// 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;
@@ -1089,7 +1089,7 @@ struct NET_EXPORT_PRIVATE TransmissionInfo {
   QuicTime sent_time;
   // Zero when the packet is serialized, non-zero once it's sent.
   QuicByteCount bytes_sent;
-  size_t nack_count;
+  QuicPacketCount nack_count;
   // Reason why this packet was transmitted.
   TransmissionType transmission_type;
   // Stores the sequence numbers of all transmissions of this packet.