Land 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 60f8167e0456edeec97f2e9b8a263d6e93c0d123..38254ff564b8e14d1a727ccd57463453bc68e16c 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -278,11 +278,12 @@ enum QuicVersion {
   // Special case to indicate unknown/unsupported QUIC version.
   QUIC_VERSION_UNSUPPORTED = 0,
 
-  QUIC_VERSION_15 = 15,
-  QUIC_VERSION_16 = 16,
-  QUIC_VERSION_18 = 18,
-  QUIC_VERSION_19 = 19,
-  QUIC_VERSION_20 = 20,  // Current version.
+  QUIC_VERSION_15 = 15,  // Revived packets in ReceivedPacketInfo.
+  QUIC_VERSION_16 = 16,  // STOP_WAITING frame.
+  QUIC_VERSION_18 = 18,  // PING frame.
+  QUIC_VERSION_19 = 19,  // Session level flow control.
+  QUIC_VERSION_20 = 20,  // Independent stream/session flow control windows.

[wtc, 2014/07/02 22:56:48]

In these two comments, did you mean "session level" or "connection level" flow
control?

[ramant (doing other things), 2014/07/16 19:43:36]

Done.

+  QUIC_VERSION_21 = 21,  // Headers/crypto streams are flow controlled.
 };
 
 // This vector contains QUIC versions which we currently support.
@@ -292,7 +293,8 @@ enum QuicVersion {
 //
 // IMPORTANT: if you are addding to this list, follow the instructions at
 // http://sites/quic/adding-and-removing-versions
-static const QuicVersion kSupportedQuicVersions[] = {QUIC_VERSION_20,
+static const QuicVersion kSupportedQuicVersions[] = {QUIC_VERSION_21,
+                                                     QUIC_VERSION_20,
                                                      QUIC_VERSION_19,
                                                      QUIC_VERSION_18,
                                                      QUIC_VERSION_16,