Deprecate FLAGS_quic_disable_pre_30. Remove QUIC versions [25-29].

net/quic/quic_protocol.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/quic_protocol.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
@@ skipping 165 matching lines @@
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     supported_versions.push_back(kSupportedQuicVersions[i]);
   }
   return supported_versions;
 }
 
 QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) {
   QuicVersionVector filtered_versions(versions.size());
   filtered_versions.clear();  // Guaranteed by spec not to change capacity.
   for (QuicVersion version : versions) {
-    if (version < QUIC_VERSION_30) {
-      if (!FLAGS_quic_disable_pre_30) {
+    if (version == QUIC_VERSION_35) {
+      if (FLAGS_quic_enable_version_35) {
+        filtered_versions.push_back(version);
+      }
+    } else if (version == QUIC_VERSION_36) {
+      if (FLAGS_quic_enable_version_35 &&
+          FLAGS_quic_enable_version_36) {
         filtered_versions.push_back(version);
       }
     } else {
-      if (version == QUIC_VERSION_35) {
-        if (FLAGS_quic_enable_version_35) {
-          filtered_versions.push_back(version);
-        }
-      } else if (version == QUIC_VERSION_36) {
-        if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36) {
-          filtered_versions.push_back(version);
-        }
-      } else {
-        filtered_versions.push_back(version);
-      }
+      filtered_versions.push_back(version);
     }
   }
   return filtered_versions;
 }
 
 QuicTag QuicVersionToQuicTag(const QuicVersion version) {
   switch (version) {
-    case QUIC_VERSION_25:
-      return MakeQuicTag('Q', '0', '2', '5');
-    case QUIC_VERSION_26:
-      return MakeQuicTag('Q', '0', '2', '6');
-    case QUIC_VERSION_27:
-      return MakeQuicTag('Q', '0', '2', '7');
-    case QUIC_VERSION_28:
-      return MakeQuicTag('Q', '0', '2', '8');
-    case QUIC_VERSION_29:
-      return MakeQuicTag('Q', '0', '2', '9');
     case QUIC_VERSION_30:
       return MakeQuicTag('Q', '0', '3', '0');
     case QUIC_VERSION_31:
       return MakeQuicTag('Q', '0', '3', '1');
     case QUIC_VERSION_32:
       return MakeQuicTag('Q', '0', '3', '2');
     case QUIC_VERSION_33:
       return MakeQuicTag('Q', '0', '3', '3');
     case QUIC_VERSION_34:
       return MakeQuicTag('Q', '0', '3', '4');
@@ skipping 20 matching lines @@
            << QuicUtils::TagToString(version_tag);
   return QUIC_VERSION_UNSUPPORTED;
 }
 
 #define RETURN_STRING_LITERAL(x) \
   case x:                        \
     return #x
 
 string QuicVersionToString(const QuicVersion version) {
   switch (version) {
-    RETURN_STRING_LITERAL(QUIC_VERSION_25);
-    RETURN_STRING_LITERAL(QUIC_VERSION_26);
-    RETURN_STRING_LITERAL(QUIC_VERSION_27);
-    RETURN_STRING_LITERAL(QUIC_VERSION_28);
-    RETURN_STRING_LITERAL(QUIC_VERSION_29);
     RETURN_STRING_LITERAL(QUIC_VERSION_30);
     RETURN_STRING_LITERAL(QUIC_VERSION_31);
     RETURN_STRING_LITERAL(QUIC_VERSION_32);
     RETURN_STRING_LITERAL(QUIC_VERSION_33);
     RETURN_STRING_LITERAL(QUIC_VERSION_34);
     RETURN_STRING_LITERAL(QUIC_VERSION_35);
     RETURN_STRING_LITERAL(QUIC_VERSION_36);
     default:
       return "QUIC_VERSION_UNSUPPORTED";
   }
@@ skipping 612 matching lines @@
       is_unackable(false),
       has_crypto_handshake(has_crypto_handshake),
       num_padding_bytes(num_padding_bytes),
       retransmission(0) {}
 
 TransmissionInfo::TransmissionInfo(const TransmissionInfo& other) = default;
 
 TransmissionInfo::~TransmissionInfo() {}
 
 }  // namespace net