Deprecate FLAGS_quic_enable_version_35.

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 a2fccaf28241510da1a4cc706489c478f0b5bc7e..f542b9fe40ae0f7ac839861e14764124d365732c 100644
--- a/net/quic/core/quic_protocol_test.cc
+++ b/net/quic/core/quic_protocol_test.cc
@@ -265,11 +265,10 @@ TEST(QuicProtocolTest, FilterSupportedVersions) {
   QuicVersionVector all_versions = {QUIC_VERSION_34, QUIC_VERSION_35,
                                     QUIC_VERSION_36};
 
-  FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
-  ASSERT_EQ(1u, filtered_versions.size());
+  ASSERT_EQ(2u, filtered_versions.size());
   EXPECT_EQ(QUIC_VERSION_34, filtered_versions[0]);
 }
 
@@ -278,7 +277,6 @@ TEST(QuicProtocolTest, FilterSupportedVersionsAllVersions) {
   QuicVersionVector all_versions = {QUIC_VERSION_34, QUIC_VERSION_35,
                                     QUIC_VERSION_36};
 
-  FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
@@ -290,7 +288,6 @@ TEST(QuicProtocolTest, FilterSupportedVersionsNo36) {
   QuicVersionVector all_versions = {QUIC_VERSION_34, QUIC_VERSION_35,
                                     QUIC_VERSION_36};
 
-  FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = false;
 
   all_versions.pop_back();  // Remove 36
@@ -298,28 +295,12 @@ TEST(QuicProtocolTest, FilterSupportedVersionsNo36) {
   ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
 }
 
-TEST(QuicProtocolTest, FilterSupportedVersionsNo35) {
-  QuicFlagSaver flags;
-  QuicVersionVector all_versions = {QUIC_VERSION_34, QUIC_VERSION_35,
-                                    QUIC_VERSION_36};
-
-  FLAGS_quic_enable_version_35 = true;
-  FLAGS_quic_enable_version_36_v2 = true;
-
-  all_versions.pop_back();  // Remove 36
-  all_versions.pop_back();  // Remove 35
-
-  ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
-}
-
 TEST(QuicProtocolTest, QuicVersionManager) {
   QuicFlagSaver flags;
-  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;
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());