Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

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 deee2839823534ca887a92545e808644752ee809..17c289f20f6a9dd97b0fb07acf71ec9516b2ec75 100644
--- a/net/quic/core/quic_protocol_test.cc
+++ b/net/quic/core/quic_protocol_test.cc
@@ -288,16 +288,15 @@ TEST(QuicProtocolTest, FilterSupportedVersions) {
       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_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
-  ASSERT_EQ(5u, filtered_versions.size());
-  EXPECT_EQ(QUIC_VERSION_30, filtered_versions[0]);
-  EXPECT_EQ(QUIC_VERSION_31, filtered_versions[1]);
-  EXPECT_EQ(QUIC_VERSION_32, filtered_versions[2]);
-  EXPECT_EQ(QUIC_VERSION_33, filtered_versions[3]);
-  EXPECT_EQ(QUIC_VERSION_34, filtered_versions[4]);
+  ASSERT_EQ(3u, filtered_versions.size());
+  EXPECT_EQ(QUIC_VERSION_32, filtered_versions[0]);
+  EXPECT_EQ(QUIC_VERSION_33, filtered_versions[1]);
+  EXPECT_EQ(QUIC_VERSION_34, filtered_versions[2]);
 }
 
 TEST(QuicProtocolTest, QuicVersionManager) {