1 files changed, 35 insertions, 34 deletions

diff --git a/chromium/net/quic/core/quic_version_manager_test.cc b/chromium/net/quic/core/quic_version_manager_test.cc
index 22faf092e4c..6a3f9c13b19 100644
--- a/chromium/net/quic/core/quic_version_manager_test.cc
+++ b/chromium/net/quic/core/quic_version_manager_test.cc
@@ -4,61 +4,62 @@
 
 #include "net/quic/core/quic_version_manager.h"
 
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_versions.h"
+#include "net/quic/platform/api/quic_flags.h"
+#include "net/quic/platform/api/quic_test.h"
 #include "net/quic/test_tools/quic_test_utils.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
-TEST(QuicVersionManagerTest, QuicVersionManager) {
-  QuicFlagSaver flags;
-  FLAGS_quic_enable_version_38 = false;
-  FLAGS_quic_reloadable_flag_quic_enable_version_36_v3 = false;
-  FLAGS_quic_reloadable_flag_quic_enable_version_37 = false;
-  FLAGS_quic_reloadable_flag_quic_disable_version_34 = false;
-  QuicVersionManager manager(AllSupportedVersions());
-  EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
-            manager.GetSupportedVersions());
+class QuicVersionManagerTest : public QuicTest {};
 
-  FLAGS_quic_reloadable_flag_quic_enable_version_36_v3 = true;
+TEST_F(QuicVersionManagerTest, QuicVersionManager) {
+  SetQuicFlag(&FLAGS_quic_enable_version_40, false);
+  FLAGS_quic_reloadable_flag_quic_enable_version_39 = false;
+  FLAGS_quic_reloadable_flag_quic_enable_version_38 = false;
+  QuicVersionManager manager(AllSupportedVersions());
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
-  ASSERT_EQ(3u, manager.GetSupportedVersions().size());
-  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[0]);
-  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[1]);
-  EXPECT_EQ(QUIC_VERSION_34, manager.GetSupportedVersions()[2]);
 
-  FLAGS_quic_reloadable_flag_quic_enable_version_37 = true;
+  FLAGS_quic_reloadable_flag_quic_enable_version_38 = true;
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
   ASSERT_EQ(4u, manager.GetSupportedVersions().size());
-  EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[0]);
-  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[1]);
-  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[2]);
-  EXPECT_EQ(QUIC_VERSION_34, manager.GetSupportedVersions()[3]);
-
-  FLAGS_quic_enable_version_38 = true;
-  EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
-            manager.GetSupportedVersions());
-  ASSERT_EQ(5u, manager.GetSupportedVersions().size());
   EXPECT_EQ(QUIC_VERSION_38, manager.GetSupportedVersions()[0]);
   EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[1]);
   EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[2]);
   EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[3]);
-  EXPECT_EQ(QUIC_VERSION_34, manager.GetSupportedVersions()[4]);
 
-  FLAGS_quic_reloadable_flag_quic_disable_version_34 = true;
+  FLAGS_quic_reloadable_flag_quic_enable_version_39 = true;
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
-  ASSERT_EQ(4u, manager.GetSupportedVersions().size());
-  EXPECT_EQ(QUIC_VERSION_38, manager.GetSupportedVersions()[0]);
-  EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[1]);
-  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[2]);
-  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[3]);
+  ASSERT_EQ(5u, manager.GetSupportedVersions().size());
+  EXPECT_EQ(QUIC_VERSION_39, manager.GetSupportedVersions()[0]);
+  EXPECT_EQ(QUIC_VERSION_38, manager.GetSupportedVersions()[1]);
+  EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[2]);
+  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[3]);
+  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[4]);
+
+  SetQuicFlag(&FLAGS_quic_enable_version_40, true);
+  ASSERT_EQ(6u, manager.GetSupportedVersions().size());
+  EXPECT_EQ(QUIC_VERSION_40, manager.GetSupportedVersions()[0]);
+  EXPECT_EQ(QUIC_VERSION_39, manager.GetSupportedVersions()[1]);
+  EXPECT_EQ(QUIC_VERSION_38, manager.GetSupportedVersions()[2]);
+  EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[3]);
+  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[4]);
+  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[5]);
+
+  EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
+            manager.GetSupportedVersions());
+  ASSERT_EQ(6u, manager.GetSupportedVersions().size());
+  EXPECT_EQ(QUIC_VERSION_40, manager.GetSupportedVersions()[0]);
+  EXPECT_EQ(QUIC_VERSION_39, manager.GetSupportedVersions()[1]);
+  EXPECT_EQ(QUIC_VERSION_38, manager.GetSupportedVersions()[2]);
+  EXPECT_EQ(QUIC_VERSION_37, manager.GetSupportedVersions()[3]);
+  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[4]);
+  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[5]);
 }
 
 }  // namespace