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

net/quic/core/quic_protocol_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_protocol.h"
 
 #include <sstream>
 
 #include "base/stl_util.h"
 #include "net/quic/core/quic_flags.h"
@@ skipping 270 matching lines @@
   std::ostringstream stream;
   stream << frame;
   EXPECT_EQ("{ path_id: 1 }\n", stream.str());
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersions) {
   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_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) {
   FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
   QuicVersionManager manager(AllSupportedVersions());
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
@@ skipping 139 matching lines @@
   EXPECT_EQ(2u, queue.NumIntervals());
   EXPECT_TRUE(queue.Contains(10));
   EXPECT_TRUE(queue.Contains(11));
   EXPECT_TRUE(queue.Contains(20));
   EXPECT_TRUE(queue.Contains(21));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net