Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/quic_versions.h

Index: net/quic/core/quic_versions.h
diff --git a/net/quic/core/quic_versions.h b/net/quic/core/quic_versions.h
index 546f16b306c75e74744b96612a1e42eb7985b381..9d3e457cae627ac8e7a07cbfda76107e5a6a38ce 100644
--- a/net/quic/core/quic_versions.h
+++ b/net/quic/core/quic_versions.h
@@ -29,7 +29,9 @@ enum QuicVersion {
   QUIC_VERSION_35 = 35,  // Allows endpoints to independently set stream limit.
   QUIC_VERSION_36 = 36,  // Add support to force HOL blocking.
   QUIC_VERSION_37 = 37,  // Add perspective into null encryption.
-  QUIC_VERSION_38 = 38,  // Experimental support for HTTP stream pairs
+  QUIC_VERSION_38 = 38,  // PADDING frame is a 1-byte frame with type 0x00.
+                         // Respect NSTP connection option.
+  QUIC_VERSION_39 = 39,  // Experimental support for HTTP stream pairs
                          // and HPACK HoL avoidance.
 
   // IMPORTANT: if you are adding to this list, follow the instructions at
@@ -44,8 +46,8 @@ enum QuicVersion {
 // IMPORTANT: if you are adding to this list, follow the instructions at
 // http://sites/quic/adding-and-removing-versions
 static const QuicVersion kSupportedQuicVersions[] = {
-    QUIC_VERSION_38, QUIC_VERSION_37, QUIC_VERSION_36, QUIC_VERSION_35,
-    QUIC_VERSION_34};
+    QUIC_VERSION_39, QUIC_VERSION_38, QUIC_VERSION_37,
+    QUIC_VERSION_36, QUIC_VERSION_35, QUIC_VERSION_34};
 
 typedef std::vector<QuicVersion> QuicVersionVector;