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

net/quic/crypto/quic_crypto_client_config_test.cc

 // Copyright 2013 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/crypto/quic_crypto_client_config.h"
 
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/quic_server_id.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_random.h"
@@ skipping 414 matching lines @@
   string error;
   QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
   EXPECT_EQ(QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND,
             config.ProcessRejection(rej, QuicWallTime::FromUNIXSeconds(0),
                                     QuicSupportedVersions().front(), "",
                                     &cached, &out_params, &error));
   EXPECT_FALSE(cached.has_server_designated_connection_id());
   EXPECT_EQ("Missing kRCID", error);
 }
 
-TEST(QuicCryptoClientConfigTest, ServerNonceinSHLO_BeforeQ027) {
-  // Test that in QUIC_VERSION_26 and lower, the the server does not need to
-  // include a nonce in the SHLO.
-  CryptoHandshakeMessage msg;
-  msg.set_tag(kSHLO);
-  // Choose the lowest version.
-  QuicVersionVector supported_versions;
-  QuicVersion version = QuicSupportedVersions().back();
-  supported_versions.push_back(version);
-  EXPECT_LE(version, QUIC_VERSION_26);
-  QuicTagVector versions;
-  versions.push_back(QuicVersionToQuicTag(version));
-  msg.SetVector(kVER, versions);
-
-  QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
-  QuicCryptoClientConfig::CachedState cached;
-  QuicCryptoNegotiatedParameters out_params;
-  string error_details;
-  config.ProcessServerHello(msg, 0, version, supported_versions, &cached,
-                            &out_params, &error_details);
-  EXPECT_NE("server hello missing server nonce", error_details);
-}
-
-TEST(QuicCryptoClientConfigTest, ServerNonceinSHLO_AfterQ027) {
-  // Test that in QUIC_VERSION_27 and higher, the the server must include a
-  // nonce in the SHLO.
+TEST(QuicCryptoClientConfigTest, ServerNonceinSHLO) {
+  // Test that the server must include a nonce in the SHLO.
   CryptoHandshakeMessage msg;
   msg.set_tag(kSHLO);
   // Choose the latest version.
   QuicVersionVector supported_versions;
   QuicVersion version = QuicSupportedVersions().front();
   supported_versions.push_back(version);
-  EXPECT_LE(QUIC_VERSION_27, version);
   QuicTagVector versions;
   versions.push_back(QuicVersionToQuicTag(version));
   msg.SetVector(kVER, versions);
 
   QuicCryptoClientConfig config(CryptoTestUtils::ProofVerifierForTesting());
   QuicCryptoClientConfig::CachedState cached;
   QuicCryptoNegotiatedParameters out_params;
   string error_details;
   EXPECT_EQ(QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER,
             config.ProcessServerHello(msg, 0, version, supported_versions,
                                       &cached, &out_params, &error_details));
   EXPECT_EQ("server hello missing server nonce", error_details);
 }
 
 }  // namespace test
 }  // namespace net