Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/quic_protocol_test.cc

Index: net/quic/core/quic_protocol_test.cc
diff --git a/net/quic/core/quic_protocol_test.cc b/net/quic/core/quic_protocol_test.cc
index 03d545d6ac15e17097a2d810ab3321c59f01cedc..b16a13b77be5e16b23cce14ca67a31cf04dd7f4c 100644
--- a/net/quic/core/quic_protocol_test.cc
+++ b/net/quic/core/quic_protocol_test.cc
@@ -82,8 +82,8 @@ TEST(QuicProtocolTest, QuicVersionToQuicTag) {
 #endif
 
   // Explicitly test a specific version.
-  EXPECT_EQ(MakeQuicTag('Q', '0', '3', '0'),
-            QuicVersionToQuicTag(QUIC_VERSION_30));
+  EXPECT_EQ(MakeQuicTag('Q', '0', '3', '2'),
+            QuicVersionToQuicTag(QUIC_VERSION_32));
 
   // Loop over all supported versions and make sure that we never hit the
   // default case (i.e. all supported versions should be successfully converted
@@ -122,8 +122,8 @@ TEST(QuicProtocolTest, QuicTagToQuicVersion) {
 #endif
 
   // Explicitly test specific versions.
-  EXPECT_EQ(QUIC_VERSION_30,
-            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '3', '0')));
+  EXPECT_EQ(QUIC_VERSION_32,
+            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '3', '2')));
 
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
@@ -156,23 +156,23 @@ TEST(QuicProtocolTest, QuicTagToQuicVersionUnsupported) {
 }
 
 TEST(QuicProtocolTest, QuicVersionToString) {
-  EXPECT_EQ("QUIC_VERSION_30", QuicVersionToString(QUIC_VERSION_30));
+  EXPECT_EQ("QUIC_VERSION_32", QuicVersionToString(QUIC_VERSION_32));
   EXPECT_EQ("QUIC_VERSION_UNSUPPORTED",
             QuicVersionToString(QUIC_VERSION_UNSUPPORTED));
 
-  QuicVersion single_version[] = {QUIC_VERSION_30};
+  QuicVersion single_version[] = {QUIC_VERSION_32};
   QuicVersionVector versions_vector;
   for (size_t i = 0; i < arraysize(single_version); ++i) {
     versions_vector.push_back(single_version[i]);
   }
-  EXPECT_EQ("QUIC_VERSION_30", QuicVersionVectorToString(versions_vector));
+  EXPECT_EQ("QUIC_VERSION_32", QuicVersionVectorToString(versions_vector));
 
-  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_30};
+  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_32};
   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_30",
+  EXPECT_EQ("QUIC_VERSION_UNSUPPORTED,QUIC_VERSION_32",
             QuicVersionVectorToString(versions_vector));
 
   // Make sure that all supported versions are present in QuicVersionToString.
@@ -286,11 +286,10 @@ TEST(QuicProtocolTest, PathCloseFrameToString) {
 
 TEST(QuicProtocolTest, FilterSupportedVersions) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = true;
   FLAGS_quic_disable_pre_34 = true;
   FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
@@ -302,11 +301,10 @@ TEST(QuicProtocolTest, FilterSupportedVersions) {
 
 TEST(QuicProtocolTest, FilterSupportedVersionsAllVersions) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
@@ -317,11 +315,10 @@ TEST(QuicProtocolTest, FilterSupportedVersionsAllVersions) {
 
 TEST(QuicProtocolTest, FilterSupportedVersionsNo36) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = false;
@@ -333,11 +330,10 @@ TEST(QuicProtocolTest, FilterSupportedVersionsNo36) {
 
 TEST(QuicProtocolTest, FilterSupportedVersionsNo35) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
@@ -348,36 +344,16 @@ TEST(QuicProtocolTest, FilterSupportedVersionsNo35) {
   ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
 }
 
-TEST(QuicProtocolTest, FilterSupportedVersionsNoPre32) {
-  QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
-
-  FLAGS_quic_disable_pre_32 = true;
-  FLAGS_quic_disable_pre_34 = false;
-  FLAGS_quic_enable_version_35 = true;
-  FLAGS_quic_enable_version_36_v2 = true;
-
-  all_versions.erase(all_versions.begin());  // Remove 30
-  all_versions.erase(all_versions.begin());  // Remove 31
-
-  ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
-}
-
 TEST(QuicProtocolTest, FilterSupportedVersionsNoPre34) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = true;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
 
-  all_versions.erase(all_versions.begin());  // Remove 30
-  all_versions.erase(all_versions.begin());  // Remove 31
   all_versions.erase(all_versions.begin());  // Remove 32
   all_versions.erase(all_versions.begin());  // Remove 33
 
@@ -400,9 +376,9 @@ TEST(QuicProtocolTest, QuicVersionManager) {
 }
 
 TEST(QuicProtocolTest, LookUpVersionByIndex) {
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
   int version_count = all_versions.size();
   for (int i = -5; i <= version_count + 1; ++i) {
     if (i >= 0 && i < version_count) {