Remove quic::QuicServerId::privacy_mode_enabled() The method was Chromium specific but crrev.com/c/5841206 removed the usage. NOT generated via copybara. PiperOrigin-RevId: 678057539
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config.cc b/quiche/quic/core/crypto/quic_crypto_client_config.cc index e0026e8..3a3670b 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config.cc +++ b/quiche/quic/core/crypto/quic_crypto_client_config.cc
@@ -822,8 +822,7 @@ return false; } - QuicServerId suffix_server_id(canonical_suffixes_[i], server_id.port(), - server_id.privacy_mode_enabled()); + QuicServerId suffix_server_id(canonical_suffixes_[i], server_id.port()); auto it = canonical_server_map_.lower_bound(suffix_server_id); if (it == canonical_server_map_.end() || it->first != suffix_server_id) { // This is the first host we've seen which matches the suffix, so make it
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc index 0367111..083f217 100644 --- a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc +++ b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -102,7 +102,7 @@ quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters> params( new QuicCryptoNegotiatedParameters); CryptoHandshakeMessage msg; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); MockRandom rand; config.FillInchoateClientHello(server_id, QuicVersionMax(), &state, &rand, /* demand_x509_proof= */ true, params, &msg); @@ -131,7 +131,7 @@ quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters> params( new QuicCryptoNegotiatedParameters); CryptoHandshakeMessage msg; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); MockRandom rand; config.FillInchoateClientHello(server_id, QuicVersionMax(), &state, &rand, /* demand_x509_proof= */ true, params, &msg); @@ -156,7 +156,7 @@ quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters> params( new QuicCryptoNegotiatedParameters); CryptoHandshakeMessage msg; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); MockRandom rand; config.FillInchoateClientHello(server_id, QuicVersionMax(), &state, &rand, /* demand_x509_proof= */ true, params, &msg); @@ -186,7 +186,7 @@ quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters> params( new QuicCryptoNegotiatedParameters); CryptoHandshakeMessage msg; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); MockRandom rand; config.FillInchoateClientHello(server_id, QuicVersionMax(), &state, &rand, /* demand_x509_proof= */ true, params, &msg); @@ -213,7 +213,7 @@ quiche::QuicheReferenceCountedPointer<QuicCryptoNegotiatedParameters> params( new QuicCryptoNegotiatedParameters); CryptoHandshakeMessage msg; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); MockRandom rand; config.FillInchoateClientHello(server_id, QuicVersionMax(), &state, &rand, /* demand_x509_proof= */ true, params, &msg); @@ -232,7 +232,7 @@ std::string error_details; MockRandom rand; CryptoHandshakeMessage chlo; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); config.FillClientHello(server_id, kConnectionId, QuicVersionMax(), QuicVersionMax(), &state, QuicWallTime::Zero(), &rand, params, &chlo, &error_details); @@ -253,7 +253,7 @@ std::string error_details; MockRandom rand; CryptoHandshakeMessage chlo; - QuicServerId server_id("www.google.com", 443, false); + QuicServerId server_id("www.google.com", 443); config.FillClientHello(server_id, kConnectionId, QuicVersionMax(), QuicVersionMax(), &state, QuicWallTime::Zero(), &rand, params, &chlo, &error_details); @@ -295,14 +295,14 @@ TEST_F(QuicCryptoClientConfigTest, InitializeFrom) { QuicCryptoClientConfig config(crypto_test_utils::ProofVerifierForTesting()); - QuicServerId canonical_server_id("www.google.com", 443, false); + QuicServerId canonical_server_id("www.google.com", 443); QuicCryptoClientConfig::CachedState* state = config.LookupOrCreate(canonical_server_id); // TODO(rch): Populate other fields of |state|. state->set_source_address_token("TOKEN"); state->SetProofValid(); - QuicServerId other_server_id("mail.google.com", 443, false); + QuicServerId other_server_id("mail.google.com", 443); config.InitializeFrom(other_server_id, canonical_server_id, &config); QuicCryptoClientConfig::CachedState* other = config.LookupOrCreate(other_server_id); @@ -316,8 +316,8 @@ TEST_F(QuicCryptoClientConfigTest, Canonical) { QuicCryptoClientConfig config(crypto_test_utils::ProofVerifierForTesting()); config.AddCanonicalSuffix(".google.com"); - QuicServerId canonical_id1("www.google.com", 443, false); - QuicServerId canonical_id2("mail.google.com", 443, false); + QuicServerId canonical_id1("www.google.com", 443); + QuicServerId canonical_id2("mail.google.com", 443); QuicCryptoClientConfig::CachedState* state = config.LookupOrCreate(canonical_id1); // TODO(rch): Populate other fields of |state|. @@ -333,15 +333,15 @@ EXPECT_EQ(state->certs(), other->certs()); EXPECT_EQ(1u, other->generation_counter()); - QuicServerId different_id("mail.google.org", 443, false); + QuicServerId different_id("mail.google.org", 443); EXPECT_TRUE(config.LookupOrCreate(different_id)->IsEmpty()); } TEST_F(QuicCryptoClientConfigTest, CanonicalNotUsedIfNotValid) { QuicCryptoClientConfig config(crypto_test_utils::ProofVerifierForTesting()); config.AddCanonicalSuffix(".google.com"); - QuicServerId canonical_id1("www.google.com", 443, false); - QuicServerId canonical_id2("mail.google.com", 443, false); + QuicServerId canonical_id1("www.google.com", 443); + QuicServerId canonical_id2("mail.google.com", 443); QuicCryptoClientConfig::CachedState* state = config.LookupOrCreate(canonical_id1); // TODO(rch): Populate other fields of |state|. @@ -358,8 +358,7 @@ // Create two states on different origins. struct TestCase { TestCase(const std::string& host, QuicCryptoClientConfig* config) - : server_id(host, 443, false), - state(config->LookupOrCreate(server_id)) { + : server_id(host, 443), state(config->LookupOrCreate(server_id)) { // TODO(rch): Populate other fields of |state|. CryptoHandshakeMessage scfg; scfg.set_tag(kSCFG); @@ -511,7 +510,7 @@ TEST_F(QuicCryptoClientConfigTest, MultipleCanonicalEntries) { QuicCryptoClientConfig config(crypto_test_utils::ProofVerifierForTesting()); config.AddCanonicalSuffix(".google.com"); - QuicServerId canonical_server_id1("www.google.com", 443, false); + QuicServerId canonical_server_id1("www.google.com", 443); QuicCryptoClientConfig::CachedState* state1 = config.LookupOrCreate(canonical_server_id1); @@ -529,7 +528,7 @@ // This will have the same |suffix_server_id| as |canonical_server_id1|, // therefore |*state2| will be initialized from |*state1|. - QuicServerId canonical_server_id2("mail.google.com", 443, false); + QuicServerId canonical_server_id2("mail.google.com", 443); QuicCryptoClientConfig::CachedState* state2 = config.LookupOrCreate(canonical_server_id2); EXPECT_FALSE(state2->IsEmpty()); @@ -539,7 +538,7 @@ // With a different |suffix_server_id|, this will return an empty CachedState. config.AddCanonicalSuffix(".example.com"); - QuicServerId canonical_server_id3("www.example.com", 443, false); + QuicServerId canonical_server_id3("www.example.com", 443); QuicCryptoClientConfig::CachedState* state3 = config.LookupOrCreate(canonical_server_id3); EXPECT_TRUE(state3->IsEmpty());
diff --git a/quiche/quic/core/http/quic_spdy_client_session_test.cc b/quiche/quic/core/http/quic_spdy_client_session_test.cc index aaf26cd..0eb6773 100644 --- a/quiche/quic/core/http/quic_spdy_client_session_test.cc +++ b/quiche/quic/core/http/quic_spdy_client_session_test.cc
@@ -107,8 +107,7 @@ SupportedVersions(GetParam())); session_ = std::make_unique<TestQuicSpdyClientSession>( DefaultQuicConfig(), SupportedVersions(GetParam()), connection_, - QuicServerId(kServerHostname, kPort, false), - client_crypto_config_.get()); + QuicServerId(kServerHostname, kPort), client_crypto_config_.get()); session_->Initialize(); connection_->SetEncrypter( ENCRYPTION_FORWARD_SECURE, @@ -172,8 +171,7 @@ connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1)); session_ = std::make_unique<TestQuicSpdyClientSession>( DefaultQuicConfig(), SupportedVersions(GetParam()), connection_, - QuicServerId(kServerHostname, kPort, false), - client_crypto_config_.get()); + QuicServerId(kServerHostname, kPort), client_crypto_config_.get()); session_->Initialize(); crypto_stream_ = static_cast<QuicCryptoClientStream*>( session_->GetMutableCryptoStream()); @@ -582,7 +580,7 @@ std::end(application_state)); session_->OnSettingsFrame(settings); EXPECT_EQ(expected, *client_session_cache_ - ->Lookup(QuicServerId(kServerHostname, kPort, false), + ->Lookup(QuicServerId(kServerHostname, kPort), session_->GetClock()->WallNow(), nullptr) ->application_state); }
diff --git a/quiche/quic/core/http/quic_spdy_client_stream_test.cc b/quiche/quic/core/http/quic_spdy_client_stream_test.cc index 0d97895..f2ced3e 100644 --- a/quiche/quic/core/http/quic_spdy_client_stream_test.cc +++ b/quiche/quic/core/http/quic_spdy_client_stream_test.cc
@@ -37,9 +37,9 @@ explicit MockQuicSpdyClientSession( const ParsedQuicVersionVector& supported_versions, QuicConnection* connection) - : QuicSpdyClientSession( - DefaultQuicConfig(), supported_versions, connection, - QuicServerId("example.com", 443, false), &crypto_config_), + : QuicSpdyClientSession(DefaultQuicConfig(), supported_versions, + connection, QuicServerId("example.com", 443), + &crypto_config_), crypto_config_(crypto_test_utils::ProofVerifierForTesting()) {} MockQuicSpdyClientSession(const MockQuicSpdyClientSession&) = delete; MockQuicSpdyClientSession& operator=(const MockQuicSpdyClientSession&) =
diff --git a/quiche/quic/core/quic_crypto_client_stream_test.cc b/quiche/quic/core/quic_crypto_client_stream_test.cc index f3508f2..9810bb7 100644 --- a/quiche/quic/core/quic_crypto_client_stream_test.cc +++ b/quiche/quic/core/quic_crypto_client_stream_test.cc
@@ -41,7 +41,7 @@ public: QuicCryptoClientStreamTest() : supported_versions_(AllSupportedVersionsWithQuicCrypto()), - server_id_(kServerHostname, kServerPort, false), + server_id_(kServerHostname, kServerPort), crypto_config_(crypto_test_utils::ProofVerifierForTesting(), std::make_unique<test::SimpleSessionCache>()), server_crypto_config_(
diff --git a/quiche/quic/core/quic_crypto_server_stream_test.cc b/quiche/quic/core/quic_crypto_server_stream_test.cc index ce9cfe4..5e5efbe 100644 --- a/quiche/quic/core/quic_crypto_server_stream_test.cc +++ b/quiche/quic/core/quic_crypto_server_stream_test.cc
@@ -64,7 +64,7 @@ std::move(proof_source), KeyExchangeSource::Default()), server_compressed_certs_cache_( QuicCompressedCertsCache::kQuicCompressedCertsCacheSize), - server_id_(kServerHostname, kServerPort, false), + server_id_(kServerHostname, kServerPort), client_crypto_config_(crypto_test_utils::ProofVerifierForTesting()) {} void Initialize() { InitializeServer(); }
diff --git a/quiche/quic/core/quic_server_id.cc b/quiche/quic/core/quic_server_id.cc index 4a5d8f7..191d932 100644 --- a/quiche/quic/core/quic_server_id.cc +++ b/quiche/quic/core/quic_server_id.cc
@@ -57,27 +57,19 @@ static_cast<uint16_t>(parsed_port_number)); } -QuicServerId::QuicServerId() : QuicServerId("", 0, false) {} +QuicServerId::QuicServerId() : QuicServerId("", 0) {} QuicServerId::QuicServerId(std::string host, uint16_t port) - : QuicServerId(std::move(host), port, false) {} - -QuicServerId::QuicServerId(std::string host, uint16_t port, - bool privacy_mode_enabled) - : host_(std::move(host)), - port_(port), - privacy_mode_enabled_(privacy_mode_enabled) {} + : host_(std::move(host)), port_(port) {} QuicServerId::~QuicServerId() {} bool QuicServerId::operator<(const QuicServerId& other) const { - return std::tie(port_, host_, privacy_mode_enabled_) < - std::tie(other.port_, other.host_, other.privacy_mode_enabled_); + return std::tie(port_, host_) < std::tie(other.port_, other.host_); } bool QuicServerId::operator==(const QuicServerId& other) const { - return privacy_mode_enabled_ == other.privacy_mode_enabled_ && - host_ == other.host_ && port_ == other.port_; + return host_ == other.host_ && port_ == other.port_; } bool QuicServerId::operator!=(const QuicServerId& other) const {
diff --git a/quiche/quic/core/quic_server_id.h b/quiche/quic/core/quic_server_id.h index 7949a9d..a067ed4 100644 --- a/quiche/quic/core/quic_server_id.h +++ b/quiche/quic/core/quic_server_id.h
@@ -27,7 +27,6 @@ QuicServerId(); QuicServerId(std::string host, uint16_t port); - QuicServerId(std::string host, uint16_t port, bool privacy_mode_enabled); ~QuicServerId(); // Needed to be an element of an ordered container. @@ -40,8 +39,6 @@ uint16_t port() const { return port_; } - bool privacy_mode_enabled() const { return privacy_mode_enabled_; } - // Returns a "host:port" representation. IPv6 literal hosts will always be // bracketed in result. std::string ToHostPortString() const; @@ -56,14 +53,12 @@ template <typename H> friend H AbslHashValue(H h, const QuicServerId& server_id) { - return H::combine(std::move(h), server_id.host(), server_id.port(), - server_id.privacy_mode_enabled()); + return H::combine(std::move(h), server_id.host(), server_id.port()); } private: std::string host_; uint16_t port_; - bool privacy_mode_enabled_; }; using QuicServerIdHash = absl::Hash<QuicServerId>;
diff --git a/quiche/quic/core/quic_server_id_test.cc b/quiche/quic/core/quic_server_id_test.cc index cbcadb6..a8ceb7c 100644 --- a/quiche/quic/core/quic_server_id_test.cc +++ b/quiche/quic/core/quic_server_id_test.cc
@@ -19,108 +19,61 @@ class QuicServerIdTest : public QuicTest {}; TEST_F(QuicServerIdTest, Constructor) { - QuicServerId google_server_id("google.com", 10, false); + QuicServerId google_server_id("google.com", 10); EXPECT_EQ("google.com", google_server_id.host()); EXPECT_EQ(10, google_server_id.port()); - EXPECT_FALSE(google_server_id.privacy_mode_enabled()); - QuicServerId private_server_id("mail.google.com", 12, true); + QuicServerId private_server_id("mail.google.com", 12); EXPECT_EQ("mail.google.com", private_server_id.host()); EXPECT_EQ(12, private_server_id.port()); - EXPECT_TRUE(private_server_id.privacy_mode_enabled()); } TEST_F(QuicServerIdTest, LessThan) { - QuicServerId a_10_https("a.com", 10, false); - QuicServerId a_11_https("a.com", 11, false); - QuicServerId b_10_https("b.com", 10, false); - QuicServerId b_11_https("b.com", 11, false); + QuicServerId a_10_https("a.com", 10); + QuicServerId a_11_https("a.com", 11); + QuicServerId b_10_https("b.com", 10); + QuicServerId b_11_https("b.com", 11); - QuicServerId a_10_https_private("a.com", 10, true); - QuicServerId a_11_https_private("a.com", 11, true); - QuicServerId b_10_https_private("b.com", 10, true); - QuicServerId b_11_https_private("b.com", 11, true); - - // Test combinations of host, port, and privacy being same on left and - // right side of less than. + // Test combinations of host and port being same on left and right side of + // less than. EXPECT_FALSE(a_10_https < a_10_https); - EXPECT_TRUE(a_10_https < a_10_https_private); - EXPECT_FALSE(a_10_https_private < a_10_https); - EXPECT_FALSE(a_10_https_private < a_10_https_private); + EXPECT_TRUE(a_10_https < a_11_https); // Test with either host, port or https being different on left and right side // of less than. - bool left_privacy; - bool right_privacy; - for (int i = 0; i < 4; i++) { - left_privacy = (i / 2 == 0); - right_privacy = (i % 2 == 0); - QuicServerId a_10_https_left_private("a.com", 10, left_privacy); - QuicServerId a_10_https_right_private("a.com", 10, right_privacy); - QuicServerId a_11_https_left_private("a.com", 11, left_privacy); - QuicServerId a_11_https_right_private("a.com", 11, right_privacy); - - QuicServerId b_10_https_left_private("b.com", 10, left_privacy); - QuicServerId b_10_https_right_private("b.com", 10, right_privacy); - QuicServerId b_11_https_left_private("b.com", 11, left_privacy); - QuicServerId b_11_https_right_private("b.com", 11, right_privacy); - - EXPECT_TRUE(a_10_https_left_private < a_11_https_right_private); - EXPECT_TRUE(a_10_https_left_private < b_10_https_right_private); - EXPECT_TRUE(a_10_https_left_private < b_11_https_right_private); - EXPECT_FALSE(a_11_https_left_private < a_10_https_right_private); - EXPECT_FALSE(a_11_https_left_private < b_10_https_right_private); - EXPECT_TRUE(a_11_https_left_private < b_11_https_right_private); - EXPECT_FALSE(b_10_https_left_private < a_10_https_right_private); - EXPECT_TRUE(b_10_https_left_private < a_11_https_right_private); - EXPECT_TRUE(b_10_https_left_private < b_11_https_right_private); - EXPECT_FALSE(b_11_https_left_private < a_10_https_right_private); - EXPECT_FALSE(b_11_https_left_private < a_11_https_right_private); - EXPECT_FALSE(b_11_https_left_private < b_10_https_right_private); - } + EXPECT_TRUE(a_10_https < a_11_https); + EXPECT_TRUE(a_10_https < b_10_https); + EXPECT_TRUE(a_10_https < b_11_https); + EXPECT_FALSE(a_11_https < a_10_https); + EXPECT_FALSE(a_11_https < b_10_https); + EXPECT_TRUE(a_11_https < b_11_https); + EXPECT_FALSE(b_10_https < a_10_https); + EXPECT_TRUE(b_10_https < a_11_https); + EXPECT_TRUE(b_10_https < b_11_https); + EXPECT_FALSE(b_11_https < a_10_https); + EXPECT_FALSE(b_11_https < a_11_https); + EXPECT_FALSE(b_11_https < b_10_https); } TEST_F(QuicServerIdTest, Equals) { - bool left_privacy; - bool right_privacy; - for (int i = 0; i < 2; i++) { - left_privacy = right_privacy = (i == 0); - QuicServerId a_10_https_right_private("a.com", 10, right_privacy); - QuicServerId a_11_https_right_private("a.com", 11, right_privacy); - QuicServerId b_10_https_right_private("b.com", 10, right_privacy); - QuicServerId b_11_https_right_private("b.com", 11, right_privacy); + QuicServerId a_10_https("a.com", 10); + QuicServerId a_11_https("a.com", 11); + QuicServerId b_10_https("b.com", 10); + QuicServerId b_11_https("b.com", 11); - EXPECT_NE(a_10_https_right_private, a_11_https_right_private); - EXPECT_NE(a_10_https_right_private, b_10_https_right_private); - EXPECT_NE(a_10_https_right_private, b_11_https_right_private); + EXPECT_NE(a_10_https, a_11_https); + EXPECT_NE(a_10_https, b_10_https); + EXPECT_NE(a_10_https, b_11_https); - QuicServerId new_a_10_https_left_private("a.com", 10, left_privacy); - QuicServerId new_a_11_https_left_private("a.com", 11, left_privacy); - QuicServerId new_b_10_https_left_private("b.com", 10, left_privacy); - QuicServerId new_b_11_https_left_private("b.com", 11, left_privacy); + QuicServerId new_a_10_https("a.com", 10); + QuicServerId new_a_11_https("a.com", 11); + QuicServerId new_b_10_https("b.com", 10); + QuicServerId new_b_11_https("b.com", 11); - EXPECT_EQ(new_a_10_https_left_private, a_10_https_right_private); - EXPECT_EQ(new_a_11_https_left_private, a_11_https_right_private); - EXPECT_EQ(new_b_10_https_left_private, b_10_https_right_private); - EXPECT_EQ(new_b_11_https_left_private, b_11_https_right_private); - } - - for (int i = 0; i < 2; i++) { - right_privacy = (i == 0); - QuicServerId a_10_https_right_private("a.com", 10, right_privacy); - QuicServerId a_11_https_right_private("a.com", 11, right_privacy); - QuicServerId b_10_https_right_private("b.com", 10, right_privacy); - QuicServerId b_11_https_right_private("b.com", 11, right_privacy); - - QuicServerId new_a_10_https_left_private("a.com", 10, false); - - EXPECT_NE(new_a_10_https_left_private, a_11_https_right_private); - EXPECT_NE(new_a_10_https_left_private, b_10_https_right_private); - EXPECT_NE(new_a_10_https_left_private, b_11_https_right_private); - } - QuicServerId a_10_https_private("a.com", 10, true); - QuicServerId new_a_10_https_no_private("a.com", 10, false); - EXPECT_NE(new_a_10_https_no_private, a_10_https_private); + EXPECT_EQ(new_a_10_https, a_10_https); + EXPECT_EQ(new_a_11_https, a_11_https); + EXPECT_EQ(new_b_10_https, b_10_https); + EXPECT_EQ(new_b_11_https, b_11_https); } TEST_F(QuicServerIdTest, Parse) { @@ -129,8 +82,6 @@ EXPECT_THAT(server_id, Optional(Property(&QuicServerId::host, "host.test"))); EXPECT_THAT(server_id, Optional(Property(&QuicServerId::port, 500))); - EXPECT_THAT(server_id, - Optional(Property(&QuicServerId::privacy_mode_enabled, false))); } TEST_F(QuicServerIdTest, CannotParseMissingPort) { @@ -167,8 +118,6 @@ EXPECT_THAT(server_id, Optional(Property(&QuicServerId::host, "[::1]"))); EXPECT_THAT(server_id, Optional(Property(&QuicServerId::port, 400))); - EXPECT_THAT(server_id, - Optional(Property(&QuicServerId::privacy_mode_enabled, false))); } TEST_F(QuicServerIdTest, ParseUnbracketedIpv6Literal) { @@ -177,8 +126,6 @@ EXPECT_THAT(server_id, Optional(Property(&QuicServerId::host, "::1"))); EXPECT_THAT(server_id, Optional(Property(&QuicServerId::port, 400))); - EXPECT_THAT(server_id, - Optional(Property(&QuicServerId::privacy_mode_enabled, false))); } TEST_F(QuicServerIdTest, AddBracketsToIpv6) {
diff --git a/quiche/quic/core/tls_client_handshaker_test.cc b/quiche/quic/core/tls_client_handshaker_test.cc index 40ff7f7..0053f75 100644 --- a/quiche/quic/core/tls_client_handshaker_test.cc +++ b/quiche/quic/core/tls_client_handshaker_test.cc
@@ -170,7 +170,7 @@ public: TlsClientHandshakerTest() : supported_versions_({GetParam()}), - server_id_(kServerHostname, kServerPort, false), + server_id_(kServerHostname, kServerPort), server_compressed_certs_cache_( QuicCompressedCertsCache::kQuicCompressedCertsCacheSize) { crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
diff --git a/quiche/quic/core/tls_server_handshaker_test.cc b/quiche/quic/core/tls_server_handshaker_test.cc index 72ae285..855d092 100644 --- a/quiche/quic/core/tls_server_handshaker_test.cc +++ b/quiche/quic/core/tls_server_handshaker_test.cc
@@ -179,7 +179,7 @@ TlsServerHandshakerTest() : server_compressed_certs_cache_( QuicCompressedCertsCache::kQuicCompressedCertsCacheSize), - server_id_(kServerHostname, kServerPort, false), + server_id_(kServerHostname, kServerPort), supported_versions_({GetParam().version}) { SetQuicFlag(quic_disable_server_tls_resumption, GetParam().disable_resumption); @@ -635,7 +635,7 @@ // Client uses upper case letters in hostname. It is considered valid by // QuicHostnameUtils::IsValidSNI, but it should be normalized for cert // selection. - server_id_ = QuicServerId("tEsT.EXAMPLE.CoM", kServerPort, false); + server_id_ = QuicServerId("tEsT.EXAMPLE.CoM", kServerPort); InitializeServerWithFakeProofSourceHandle(); server_handshaker_->SetupProofSourceHandle( /*select_cert_action=*/FakeProofSourceHandle::Action::DELEGATE_SYNC, @@ -742,7 +742,7 @@ TEST_P(TlsServerHandshakerTest, RejectInvalidSNI) { SetQuicFlag(quic_client_allow_invalid_sni_for_test, true); - server_id_ = QuicServerId("invalid!.example.com", kServerPort, false); + server_id_ = QuicServerId("invalid!.example.com", kServerPort); InitializeFakeClient(); // Run the handshake and expect it to fail.
diff --git a/quiche/quic/qbone/qbone_client_test.cc b/quiche/quic/qbone/qbone_client_test.cc index a8e78a2..d7ea860 100644 --- a/quiche/quic/qbone/qbone_client_test.cc +++ b/quiche/quic/qbone/qbone_client_test.cc
@@ -215,8 +215,7 @@ std::unique_ptr<QuicEventLoop> event_loop = GetDefaultEventLoop()->Create(quic::QuicDefaultClock::Get()); QboneTestClient client( - server_address, - QuicServerId("test.example.com", server_address.port(), false), + server_address, QuicServerId("test.example.com", server_address.port()), ParsedQuicVersionVector{GetParam()}, event_loop.get(), crypto_test_utils::ProofVerifierForTesting()); ASSERT_TRUE(client.Initialize());
diff --git a/quiche/quic/qbone/qbone_session_test.cc b/quiche/quic/qbone/qbone_session_test.cc index 1a8fd31..9aebac4 100644 --- a/quiche/quic/qbone/qbone_session_test.cc +++ b/quiche/quic/qbone/qbone_session_test.cc
@@ -327,7 +327,7 @@ client_peer_ = std::make_unique<QboneClientSession>( client_connection_, client_crypto_config_.get(), /*owner=*/nullptr, config, supported_versions_, - QuicServerId("test.example.com", 1234, false), client_writer_.get(), + QuicServerId("test.example.com", 1234), client_writer_.get(), client_handler_.get()); }
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc index aba6fc0..1513064 100644 --- a/quiche/quic/test_tools/quic_test_client.cc +++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -306,9 +306,8 @@ const QuicConfig& config, const ParsedQuicVersionVector& supported_versions) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), client_(std::make_unique<MockableQuicClient>( - server_address, - QuicServerId(server_hostname, server_address.port(), false), config, - supported_versions, event_loop_.get())) { + server_address, QuicServerId(server_hostname, server_address.port()), + config, supported_versions, event_loop_.get())) { Initialize(); } @@ -318,9 +317,9 @@ std::unique_ptr<ProofVerifier> proof_verifier) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), client_(std::make_unique<MockableQuicClient>( - server_address, - QuicServerId(server_hostname, server_address.port(), false), config, - supported_versions, event_loop_.get(), std::move(proof_verifier))) { + server_address, QuicServerId(server_hostname, server_address.port()), + config, supported_versions, event_loop_.get(), + std::move(proof_verifier))) { Initialize(); } @@ -331,10 +330,9 @@ std::unique_ptr<SessionCache> session_cache) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), client_(std::make_unique<MockableQuicClient>( - server_address, - QuicServerId(server_hostname, server_address.port(), false), config, - supported_versions, event_loop_.get(), std::move(proof_verifier), - std::move(session_cache))) { + server_address, QuicServerId(server_hostname, server_address.port()), + config, supported_versions, event_loop_.get(), + std::move(proof_verifier), std::move(session_cache))) { Initialize(); } @@ -346,10 +344,9 @@ std::unique_ptr<QuicEventLoop> event_loop) : event_loop_(std::move(event_loop)), client_(std::make_unique<MockableQuicClient>( - server_address, - QuicServerId(server_hostname, server_address.port(), false), config, - supported_versions, event_loop_.get(), std::move(proof_verifier), - std::move(session_cache))) { + server_address, QuicServerId(server_hostname, server_address.port()), + config, supported_versions, event_loop_.get(), + std::move(proof_verifier), std::move(session_cache))) { Initialize(); } @@ -586,8 +583,7 @@ // If we've been asked to override SNI, set it now if (override_sni_set_) { - client_->set_server_id( - QuicServerId(override_sni_, address().port(), false)); + client_->set_server_id(QuicServerId(override_sni_, address().port())); } client_->Connect();
diff --git a/quiche/quic/tools/quic_client_interop_test_bin.cc b/quiche/quic/tools/quic_client_interop_test_bin.cc index 17b51f5..0df5e68 100644 --- a/quiche/quic/tools/quic_client_interop_test_bin.cc +++ b/quiche/quic/tools/quic_client_interop_test_bin.cc
@@ -375,7 +375,7 @@ QUIC_LOG(ERROR) << "Failed to resolve " << dns_host; return std::set<Feature>(); } - QuicServerId server_id(url_host, port, false); + QuicServerId server_id(url_host, port); std::string authority = absl::StrCat(url_host, ":", port); QuicClientInteropRunner runner;
diff --git a/quiche/quic/tools/quic_default_client_test.cc b/quiche/quic/tools/quic_default_client_test.cc index 836faaa..666ecbc 100644 --- a/quiche/quic/tools/quic_default_client_test.cc +++ b/quiche/quic/tools/quic_default_client_test.cc
@@ -82,7 +82,7 @@ // Caller is responsible for deletion. std::unique_ptr<QuicDefaultClient> CreateAndInitializeQuicClient() { QuicSocketAddress server_address(QuicSocketAddress(TestLoopback(), 0)); - QuicServerId server_id("hostname", server_address.port(), false); + QuicServerId server_id("hostname", server_address.port()); ParsedQuicVersionVector versions = AllSupportedVersions(); auto client = std::make_unique<QuicDefaultClient>( server_address, server_id, versions, event_loop_.get(),
diff --git a/quiche/quic/tools/quic_epoll_client_factory.cc b/quiche/quic/tools/quic_epoll_client_factory.cc index 2ecc0ef..d87c937 100644 --- a/quiche/quic/tools/quic_epoll_client_factory.cc +++ b/quiche/quic/tools/quic_epoll_client_factory.cc
@@ -33,7 +33,7 @@ QUIC_LOG(ERROR) << "Unable to resolve address: " << host_for_lookup; return nullptr; } - QuicServerId server_id(host_for_handshake, port, false); + QuicServerId server_id(host_for_handshake, port); return std::make_unique<QuicDefaultClient>( addr, server_id, versions, config, event_loop_.get(), std::move(verifier), std::move(session_cache));