Land Recent QUIC Changes.

net/quic/quic_protocol_test.cc

Index: net/quic/quic_protocol_test.cc
diff --git a/net/quic/quic_protocol_test.cc b/net/quic/quic_protocol_test.cc
index 9f03900925a94d43de8cdf2fb019516a77d519bc..4f234908c72b71813239804ed4840560ada55c13 100644
--- a/net/quic/quic_protocol_test.cc
+++ b/net/quic/quic_protocol_test.cc
@@ -16,9 +16,6 @@ TEST(QuicProtocolTest, AdjustErrorForVersion) {
       << "Any additions to QuicRstStreamErrorCode require an addition to "
       << "AdjustErrorForVersion and this associated test.";
 
-  EXPECT_EQ(QUIC_STREAM_NO_ERROR,
-            AdjustErrorForVersion(QUIC_RST_FLOW_CONTROL_ACCOUNTING,
-                                  QUIC_VERSION_16));
   EXPECT_EQ(QUIC_RST_FLOW_CONTROL_ACCOUNTING, AdjustErrorForVersion(
       QUIC_RST_FLOW_CONTROL_ACCOUNTING,
       QUIC_VERSION_18));
@@ -69,8 +66,8 @@ TEST(QuicProtocolTest, QuicVersionToQuicTag) {
 #endif
 
   // Explicitly test a specific version.
-  EXPECT_EQ(MakeQuicTag('Q', '0', '1', '6'),
-            QuicVersionToQuicTag(QUIC_VERSION_16));
+  EXPECT_EQ(MakeQuicTag('Q', '0', '1', '9'),
+            QuicVersionToQuicTag(QUIC_VERSION_19));
 
   // Loop over all supported versions and make sure that we never hit the
   // default case (i.e. all supported versions should be successfully converted
@@ -108,8 +105,8 @@ TEST(QuicProtocolTest, QuicTagToQuicVersion) {
 #endif
 
   // Explicitly test specific versions.
-  EXPECT_EQ(QUIC_VERSION_16,
-            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '1', '6')));
+  EXPECT_EQ(QUIC_VERSION_19,
+            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '1', '9')));
 
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
@@ -140,23 +137,23 @@ TEST(QuicProtocolTest, QuicTagToQuicVersionUnsupported) {
 }
 
 TEST(QuicProtocolTest, QuicVersionToString) {
-  EXPECT_EQ("QUIC_VERSION_16", QuicVersionToString(QUIC_VERSION_16));
+  EXPECT_EQ("QUIC_VERSION_19", QuicVersionToString(QUIC_VERSION_19));
   EXPECT_EQ("QUIC_VERSION_UNSUPPORTED",
             QuicVersionToString(QUIC_VERSION_UNSUPPORTED));
 
-  QuicVersion single_version[] = {QUIC_VERSION_16};
+  QuicVersion single_version[] = {QUIC_VERSION_19};
   QuicVersionVector versions_vector;
   for (size_t i = 0; i < arraysize(single_version); ++i) {
     versions_vector.push_back(single_version[i]);
   }
-  EXPECT_EQ("QUIC_VERSION_16", QuicVersionVectorToString(versions_vector));
+  EXPECT_EQ("QUIC_VERSION_19", QuicVersionVectorToString(versions_vector));
 
-  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_16};
+  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_19};
   versions_vector.clear();
   for (size_t i = 0; i < arraysize(multiple_versions); ++i) {
     versions_vector.push_back(multiple_versions[i]);
   }
-  EXPECT_EQ("QUIC_VERSION_UNSUPPORTED,QUIC_VERSION_16",
+  EXPECT_EQ("QUIC_VERSION_UNSUPPORTED,QUIC_VERSION_19",
             QuicVersionVectorToString(versions_vector));
 
   // Make sure that all supported versions are present in QuicVersionToString.