Landing Recent QUIC Changes.

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 d91b55f3211aea309a54cc73d8f5e1fa6a79b4ca..6b29331e3b6a43d680021376327f131069ad5be8 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -70,7 +70,7 @@ const uint32 kDefaultFlowControlSendWindow = 16 * 1024;  // 16 KB
 const size_t kMaxTcpCongestionWindow = 200;
 
 // Size of the socket receive buffer in bytes.
-const QuicByteCount kDefaultSocketReceiveBuffer = 256000;
+const QuicByteCount kDefaultSocketReceiveBuffer = 256 * 1024;
 
 // Don't allow a client to suggest an RTT longer than 15 seconds.
 const uint32 kMaxInitialRoundTripTimeUs = 15 * kNumMicrosPerSecond;
@@ -104,6 +104,9 @@ const QuicStreamId kCryptoStreamId = 1;
 // Reserved ID for the headers stream.
 const QuicStreamId kHeadersStreamId = 3;
 
+// Maximum delayed ack time, in ms.
+const int kMaxDelayedAckTime = 25;

[wtc, 2014/08/15 18:54:57]

Nit: it would be a good idea to add "Ms" to the constant name. That seems to be
the convention in this file. See kMaxInitialRoundTripTimeUs on line 76 and
kDefaultInitialTimeoutSecs etc. on line 112. You can make this change in the
internal tree first.

[ramant (doing other things), 2014/08/19 17:48:41]

Thanks for making the above change in the internal source tree. Will merge that
in future CL.

Done.

+
 // This is the default network timeout a for connection till the crypto
 // handshake succeeds and the negotiated timeout from the handshake is received.
 const int64 kDefaultInitialTimeoutSecs = 120;  // 2 mins.