Remove GetSupportedVersionsWithQuicCrypto() because it's unused. PiperOrigin-RevId: 424147282
diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc index 973254e..0da608c 100644 --- a/quic/core/quic_dispatcher.cc +++ b/quic/core/quic_dispatcher.cc
@@ -1377,11 +1377,6 @@ return version_manager_->GetSupportedVersions(); } -const ParsedQuicVersionVector& -QuicDispatcher::GetSupportedVersionsWithQuicCrypto() { - return version_manager_->GetSupportedVersionsWithQuicCrypto(); -} - void QuicDispatcher::DeliverPacketsToSession( const std::list<BufferedPacket>& packets, QuicSession* session) {
diff --git a/quic/core/quic_dispatcher.h b/quic/core/quic_dispatcher.h index 3863ce9..f22d58a 100644 --- a/quic/core/quic_dispatcher.h +++ b/quic/core/quic_dispatcher.h
@@ -256,8 +256,6 @@ const ParsedQuicVersionVector& GetSupportedVersions(); - const ParsedQuicVersionVector& GetSupportedVersionsWithQuicCrypto(); - const QuicConfig& config() const { return *config_; } const QuicCryptoServerConfig* crypto_config() const { return crypto_config_; }
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc index 3aa821c..13e590d 100644 --- a/quic/core/quic_version_manager.cc +++ b/quic/core/quic_version_manager.cc
@@ -30,12 +30,6 @@ return filtered_supported_versions_with_http3_; } -const ParsedQuicVersionVector& -QuicVersionManager::GetSupportedVersionsWithQuicCrypto() { - MaybeRefilterSupportedVersions(); - return filtered_supported_versions_with_quic_crypto_; -} - const std::vector<std::string>& QuicVersionManager::GetSupportedAlpns() { MaybeRefilterSupportedVersions(); return filtered_supported_alpns_; @@ -69,7 +63,6 @@ filtered_supported_versions_ = FilterSupportedVersions(allowed_supported_versions_); filtered_supported_versions_with_http3_.clear(); - filtered_supported_versions_with_quic_crypto_.clear(); filtered_transport_versions_.clear(); filtered_supported_alpns_.clear(); for (const ParsedQuicVersion& version : filtered_supported_versions_) { @@ -82,9 +75,6 @@ if (version.UsesHttp3()) { filtered_supported_versions_with_http3_.push_back(version); } - if (version.handshake_protocol == PROTOCOL_QUIC_CRYPTO) { - filtered_supported_versions_with_quic_crypto_.push_back(version); - } filtered_supported_alpns_.emplace_back(AlpnForVersion(version)); } }
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h index a3ae719..af44d34 100644 --- a/quic/core/quic_version_manager.h +++ b/quic/core/quic_version_manager.h
@@ -25,9 +25,6 @@ // Returns currently supported versions using HTTP/3. const ParsedQuicVersionVector& GetSupportedVersionsWithOnlyHttp3(); - // Returns currently supported versions using QUIC crypto. - const ParsedQuicVersionVector& GetSupportedVersionsWithQuicCrypto(); - // Returns the list of supported ALPNs, based on the current supported // versions and any custom additions by subclasses. const std::vector<std::string>& GetSupportedAlpns(); @@ -82,8 +79,6 @@ ParsedQuicVersionVector filtered_supported_versions_; // Currently supported versions using HTTP/3. ParsedQuicVersionVector filtered_supported_versions_with_http3_; - // Currently supported versions using QUIC crypto. - ParsedQuicVersionVector filtered_supported_versions_with_quic_crypto_; // This vector contains the transport versions from // |filtered_supported_versions_|. No guarantees are made that the same // transport version isn't repeated.
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc index 8960bce..403009a 100644 --- a/quic/core/quic_version_manager_test.cc +++ b/quic/core/quic_version_manager_test.cc
@@ -37,8 +37,6 @@ EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), manager.GetSupportedVersions()); EXPECT_TRUE(manager.GetSupportedVersionsWithOnlyHttp3().empty()); - EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), - manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(), ElementsAre("h3-Q050", "h3-Q046", "h3-Q043")); @@ -47,15 +45,11 @@ expected_parsed_versions.insert(expected_parsed_versions.begin(), ParsedQuicVersion::Draft29()); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); - EXPECT_EQ(expected_parsed_versions.size() - 1 - offset, - manager.GetSupportedVersionsWithQuicCrypto().size()); EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), manager.GetSupportedVersions()); EXPECT_EQ(1u, manager.GetSupportedVersionsWithOnlyHttp3().size()); EXPECT_EQ(CurrentSupportedHttp3Versions(), manager.GetSupportedVersionsWithOnlyHttp3()); - EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), - manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(), ElementsAre("h3-29", "h3-Q050", "h3-Q046", "h3-Q043")); @@ -64,15 +58,11 @@ expected_parsed_versions.insert(expected_parsed_versions.begin(), ParsedQuicVersion::RFCv1()); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); - EXPECT_EQ(expected_parsed_versions.size() - 1 - offset, - manager.GetSupportedVersionsWithQuicCrypto().size()); EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), manager.GetSupportedVersions()); EXPECT_EQ(2u, manager.GetSupportedVersionsWithOnlyHttp3().size()); EXPECT_EQ(CurrentSupportedHttp3Versions(), manager.GetSupportedVersionsWithOnlyHttp3()); - EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), - manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(), ElementsAre("h3", "h3-29", "h3-Q050", "h3-Q046", "h3-Q043")); }