Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Unified Diff: net/quic/crypto/crypto_server_test.cc

Issue 2176323002: Deprecate FLAGS_quic_disable_pre_30. Remove QUIC versions [25-29]. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@127879468
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/quic/crypto/proof_verifier_chromium_test.cc » ('j') | net/tools/quic/quic_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/crypto_server_test.cc
diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc
index 91a4458b2261494999b2d0c57916bba0ba29712a..40a715b6f2d7fc97e69488508812f23c07b0344b 100644
--- a/net/quic/crypto/crypto_server_test.cc
+++ b/net/quic/crypto/crypto_server_test.cc
@@ -434,14 +434,13 @@ TEST_P(CryptoServerTest, DefaultCert) {
StringPiece cert, proof, cert_sct;
EXPECT_TRUE(out_.GetStringPiece(kCertificateTag, &cert));
EXPECT_TRUE(out_.GetStringPiece(kPROF, &proof));
- EXPECT_EQ(client_version_ > QUIC_VERSION_29,
- out_.GetStringPiece(kCertificateSCTTag, &cert_sct));
+ EXPECT_TRUE(out_.GetStringPiece(kCertificateSCTTag, &cert_sct));
EXPECT_NE(0u, cert.size());
EXPECT_NE(0u, proof.size());
const HandshakeFailureReason kRejectReasons[] = {
SERVER_CONFIG_INCHOATE_HELLO_FAILURE};
CheckRejectReasons(kRejectReasons, arraysize(kRejectReasons));
- EXPECT_EQ(client_version_ > QUIC_VERSION_29, cert_sct.size() > 0);
+ EXPECT_LT(0u, cert_sct.size());
}
TEST_P(CryptoServerTest, RejectTooLarge) {
@@ -499,8 +498,7 @@ TEST_P(CryptoServerTest, RejectTooLargeButValidSTK) {
StringPiece cert, proof, cert_sct;
EXPECT_TRUE(out_.GetStringPiece(kCertificateTag, &cert));
EXPECT_TRUE(out_.GetStringPiece(kPROF, &proof));
- EXPECT_EQ(client_version_ > QUIC_VERSION_29,
- out_.GetStringPiece(kCertificateSCTTag, &cert_sct));
+ EXPECT_TRUE(out_.GetStringPiece(kCertificateSCTTag, &cert_sct));
EXPECT_NE(0u, cert.size());
EXPECT_NE(0u, proof.size());
const HandshakeFailureReason kRejectReasons[] = {
@@ -864,10 +862,6 @@ TEST_P(CryptoServerTest, ProofForSuppliedServerConfig) {
}
TEST_P(CryptoServerTest, RejectInvalidXlct) {
- if (client_version_ <= QUIC_VERSION_25) {
- // XLCT tag introduced in QUIC_VERSION_26.
- return;
- }
// clang-format off
CryptoHandshakeMessage msg = CryptoTestUtils::Message(
"CHLO",
@@ -924,7 +918,6 @@ TEST_P(CryptoServerTest, ValidXlct) {
}
TEST_P(CryptoServerTest, NonceInSHLO) {
- // After QUIC_VERSION_27, the SHLO should contain a nonce.
// clang-format off
CryptoHandshakeMessage msg = CryptoTestUtils::Message(
"CHLO",
@@ -949,11 +942,7 @@ TEST_P(CryptoServerTest, NonceInSHLO) {
EXPECT_EQ(kSHLO, out_.tag());
StringPiece nonce;
- if (client_version_ <= QUIC_VERSION_26) {
- EXPECT_FALSE(out_.GetStringPiece(kServerNonceTag, &nonce));
- } else {
- EXPECT_TRUE(out_.GetStringPiece(kServerNonceTag, &nonce));
- }
+ EXPECT_TRUE(out_.GetStringPiece(kServerNonceTag, &nonce));
}
TEST(CryptoServerConfigGenerationTest, Determinism) {
« no previous file with comments | « no previous file | net/quic/crypto/proof_verifier_chromium_test.cc » ('j') | net/tools/quic/quic_dispatcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698