gfe-relnote: Roll forward the deprecation of gfe2_reloadable_flag_quic_enable_version_46 as this does not cause b3m prober failure anymore.
PiperOrigin-RevId: 252884492
Change-Id: I48ae9cf10574a816ed9fb5e3c49555fabf5a2b00
diff --git a/quic/quartc/quartc_endpoint_test.cc b/quic/quartc/quartc_endpoint_test.cc
index 5f8c25d..6b56b1a 100644
--- a/quic/quartc/quartc_endpoint_test.cc
+++ b/quic/quartc/quartc_endpoint_test.cc
@@ -80,11 +80,6 @@
// attempts to connect using a newer version.
TEST_F(QuartcEndpointTest,
QUIC_TEST_DISABLED_IN_CHROME(ServerNegotiatesForOldVersion)) {
- // Note: for this test, we need support for two versions. Which two shouldn't
- // matter, but they must be enabled so that the version manager doesn't filter
- // them out.
- SetQuicReloadableFlag(quic_enable_version_46, true);
-
// Reset the client endpoint to prefer version 46 but also be capable of
// speaking version 43.
ParsedQuicVersionVector client_versions;
@@ -126,11 +121,6 @@
// QUIC versions.
TEST_F(QuartcEndpointTest,
QUIC_TEST_DISABLED_IN_CHROME(ServerAcceptsOldVersion)) {
- // Note: for this test, we need support for two versions. Which two shouldn't
- // matter, but they must be enabled so that the version manager doesn't filter
- // them out.
- SetQuicReloadableFlag(quic_enable_version_46, true);
-
// Reset the client endpoint to only speak version 43.
ParsedQuicVersionVector client_versions;
client_versions.push_back({PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43});
@@ -172,11 +162,6 @@
// completely disjoint sets of versions.
TEST_F(QuartcEndpointTest,
QUIC_TEST_DISABLED_IN_CHROME(VersionNegotiationWithDisjointVersions)) {
- // Note: for this test, we need support for two versions. Which two shouldn't
- // matter, but they must be enabled so that the version manager doesn't filter
- // them out.
- SetQuicReloadableFlag(quic_enable_version_46, true);
-
// Reset the client endpoint to only speak version 43.
ParsedQuicVersionVector client_versions;
client_versions.push_back({PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43});
@@ -219,11 +204,6 @@
// version negotiation fails.
SetQuicReloadableFlag(quic_no_client_conn_ver_negotiation, true);
- // Note: for this test, we need support for two versions. Which two shouldn't
- // matter, but they must be enabled so that the version manager doesn't filter
- // them out.
- SetQuicReloadableFlag(quic_enable_version_46, true);
-
// Reset the client endpoint to prefer version 46 but also be capable of
// speaking version 43.
ParsedQuicVersionVector client_versions;
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc
index b75244c..a0affb5 100644
--- a/quic/quartc/quartc_factory.cc
+++ b/quic/quartc/quartc_factory.cc
@@ -62,9 +62,6 @@
// Fix b/110259444.
SetQuicReloadableFlag(quic_fix_spurious_ack_alarm, true);
- // Enable version 46 to enable SendMessage API and 'quic bit' per draft 17.
- SetQuicReloadableFlag(quic_enable_version_46, true);
-
// Enable version 47 to enable variable-length connection ids.
SetQuicReloadableFlag(quic_enable_version_47, true);
@@ -101,7 +98,7 @@
// In exoblaze this may return false. DCHECK to avoid problems caused by
// incorrect flags configuration.
- DCHECK(GetQuicReloadableFlag(quic_enable_version_46))
+ DCHECK(GetQuicReloadableFlag(quic_enable_version_47))
<< "Your build does not support quic reloadable flags and shouldn't "
"place Quartc calls";
