Landing Recent QUIC changes until 9/14/2015 19:47 UTC

relnote: Change QuicSpdyServerStream to correctly handle multiple Content-Length values.

Merge internal change: 103019414
https://codereview.chromium.org/1356263002/

relnote: deprecate FLAGS_quic_limit_mtu_by_writer.

Merge internal change: 102991700
https://codereview.chromium.org/1358913002/

relnote: Add XLCT tag to QUIC client hello gated by QUIC_VERSION_26.

In the client hello, the client sends the XLCT tag to indicate what it expects
the server's leaf certificate to be. If present, the server verifies the tag
and rejects the hello if the value in the tag doesn't match.

Merge internal change: 102874973
https://codereview.chromium.org/1358713002/

Review URL: https://codereview.chromium.org/1360843002

Cr-Commit-Position: refs/heads/master@{#350208}
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index da542333..bfe7cc5 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -338,6 +338,7 @@
   QUIC_VERSION_24 = 24,  // SPDY/4 header compression.
   QUIC_VERSION_25 = 25,  // SPDY/4 header keys, and removal of error_details
                          // from QuicRstStreamFrame
+  QUIC_VERSION_26 = 26,  // In CHLO, send XLCT tag containing hash of leaf cert
 };
 
 // This vector contains QUIC versions which we currently support.
@@ -347,8 +348,8 @@
 //
 // 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_25,
-                                                     QUIC_VERSION_24};
+static const QuicVersion kSupportedQuicVersions[] = {
+    QUIC_VERSION_26, QUIC_VERSION_25, QUIC_VERSION_24};
 
 typedef std::vector<QuicVersion> QuicVersionVector;