Landing Recent QUIC changes until Mon Apr 17 2017

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 9d3e457cae627ac8e7a07cbfda76107e5a6a38ce..d228b41ab6dc875bd4283902a5694fd8d259d732 100644
--- a/net/quic/core/quic_versions.h
+++ b/net/quic/core/quic_versions.h
@@ -24,8 +24,6 @@ enum QuicVersion {
   // Special case to indicate unknown/unsupported QUIC version.
   QUIC_VERSION_UNSUPPORTED = 0,
 
-  QUIC_VERSION_34 = 34,  // Deprecates entropy, removes private flag from packet
-                         // header, uses new ack and stop waiting wire format.
   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.
@@ -46,8 +44,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_39, 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};
 
 typedef std::vector<QuicVersion> QuicVersionVector;