gfe-relnote: Use new flag quic_enable_version_48_2 for QUIC_VERSION_48
PiperOrigin-RevId: 264647709
Change-Id: Ic8f1c7e51a547c09b8f7265882a100cdcfc6b930
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index d589854..fe4fe40 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -937,7 +937,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, true);
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
SetQuicReloadableFlag(quic_enable_version_99, true);
VerifyVersionNotSupported(QuicVersionReservedForNegotiation());
@@ -947,12 +947,12 @@
VerifyVersionSupported(QuicVersionMax());
// Turn off version 48.
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
VerifyVersionNotSupported(
ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48));
// Turn on version 48.
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
VerifyVersionSupported(
ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48));
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc
index 49aee67..7c658f7 100644
--- a/quic/core/quic_version_manager.cc
+++ b/quic/core/quic_version_manager.cc
@@ -15,7 +15,7 @@
QuicVersionManager::QuicVersionManager(
ParsedQuicVersionVector supported_versions)
: enable_version_99_(GetQuicReloadableFlag(quic_enable_version_99)),
- enable_version_48_(GetQuicReloadableFlag(quic_enable_version_48)),
+ enable_version_48_(GetQuicReloadableFlag(quic_enable_version_48_2)),
enable_version_47_(GetQuicReloadableFlag(quic_enable_version_47)),
disable_version_44_(GetQuicReloadableFlag(quic_disable_version_44)),
disable_version_39_(GetQuicReloadableFlag(quic_disable_version_39)),
@@ -39,13 +39,13 @@
void QuicVersionManager::MaybeRefilterSupportedVersions() {
if (enable_version_99_ != GetQuicReloadableFlag(quic_enable_version_99) ||
- enable_version_48_ != GetQuicReloadableFlag(quic_enable_version_48) ||
+ enable_version_48_ != GetQuicReloadableFlag(quic_enable_version_48_2) ||
enable_version_47_ != GetQuicReloadableFlag(quic_enable_version_47) ||
disable_version_44_ != GetQuicReloadableFlag(quic_disable_version_44) ||
disable_version_39_ != GetQuicReloadableFlag(quic_disable_version_39) ||
enable_tls_ != GetQuicFlag(FLAGS_quic_supports_tls_handshake)) {
enable_version_99_ = GetQuicReloadableFlag(quic_enable_version_99);
- enable_version_48_ = GetQuicReloadableFlag(quic_enable_version_48);
+ enable_version_48_ = GetQuicReloadableFlag(quic_enable_version_48_2);
enable_version_47_ = GetQuicReloadableFlag(quic_enable_version_47);
disable_version_44_ = GetQuicReloadableFlag(quic_disable_version_44);
disable_version_39_ = GetQuicReloadableFlag(quic_disable_version_39);
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h
index a6b7bcb..b442a4c 100644
--- a/quic/core/quic_version_manager.h
+++ b/quic/core/quic_version_manager.h
@@ -40,7 +40,7 @@
private:
// quic_enable_version_99 flag
bool enable_version_99_;
- // quic_enable_version_48 flag
+ // quic_enable_version_48_2 flag
bool enable_version_48_;
// quic_enable_version_47 flag
bool enable_version_47_;
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc
index 886c0d3..645f778 100644
--- a/quic/core/quic_version_manager_test.cc
+++ b/quic/core/quic_version_manager_test.cc
@@ -19,7 +19,7 @@
static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 7u,
"Supported versions out of sync");
SetQuicReloadableFlag(quic_enable_version_99, false);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_47, false);
SetQuicReloadableFlag(quic_disable_version_44, true);
SetQuicReloadableFlag(quic_disable_version_39, true);
@@ -47,7 +47,7 @@
QUIC_VERSION_39}),
manager.GetSupportedTransportVersions());
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
EXPECT_EQ(QuicTransportVersionVector({QUIC_VERSION_48, QUIC_VERSION_47,
QUIC_VERSION_46, QUIC_VERSION_44,
QUIC_VERSION_43, QUIC_VERSION_39}),
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 3fd870f..d4f4b42 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -259,7 +259,7 @@
filtered_versions.push_back(version);
}
} else if (version.transport_version == QUIC_VERSION_48) {
- if (GetQuicReloadableFlag(quic_enable_version_48)) {
+ if (GetQuicReloadableFlag(quic_enable_version_48_2)) {
filtered_versions.push_back(version);
}
} else if (version.transport_version == QUIC_VERSION_47) {
@@ -488,7 +488,7 @@
SetQuicReloadableFlag(quic_enable_version_99, true);
}
if (parsed_version.transport_version == QUIC_VERSION_48) {
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
}
if (parsed_version.transport_version == QUIC_VERSION_47) {
SetQuicReloadableFlag(quic_enable_version_47, true);
diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index 016ae5f..f6223e7 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc
@@ -310,7 +310,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, true);
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
SetQuicReloadableFlag(quic_enable_version_99, true);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -334,7 +334,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, true);
- SetQuicReloadableFlag(quic_enable_version_48, true);
+ SetQuicReloadableFlag(quic_enable_version_48_2, true);
SetQuicReloadableFlag(quic_enable_version_99, false);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -358,7 +358,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, true);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_99, false);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -382,7 +382,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, false);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_99, false);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -405,7 +405,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, true);
SetQuicReloadableFlag(quic_enable_version_47, false);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_99, false);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -428,7 +428,7 @@
SetQuicReloadableFlag(quic_disable_version_39, true);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, false);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_99, false);
ParsedQuicVersionVector parsed_versions;
for (QuicTransportVersion version : all_versions) {
@@ -556,7 +556,7 @@
SetQuicReloadableFlag(quic_disable_version_39, false);
SetQuicReloadableFlag(quic_disable_version_44, false);
SetQuicReloadableFlag(quic_enable_version_47, false);
- SetQuicReloadableFlag(quic_enable_version_48, false);
+ SetQuicReloadableFlag(quic_enable_version_48_2, false);
SetQuicReloadableFlag(quic_enable_version_99, false);
{
@@ -564,7 +564,7 @@
QuicEnableVersion(parsed_version_q047);
EXPECT_FALSE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_47));
- EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48));
+ EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48_2));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99));
}
@@ -573,7 +573,7 @@
QuicEnableVersion(parsed_version_t047);
EXPECT_TRUE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_47));
- EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48));
+ EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48_2));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99));
}
@@ -582,7 +582,7 @@
QuicEnableVersion(parsed_version_q048);
EXPECT_FALSE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_47));
- EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_48));
+ EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_48_2));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99));
}
@@ -591,7 +591,7 @@
QuicEnableVersion(parsed_version_t048);
EXPECT_TRUE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_47));
- EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_48));
+ EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_48_2));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_99));
}
@@ -600,7 +600,7 @@
QuicEnableVersion(parsed_version_t099);
EXPECT_TRUE(GetQuicFlag(FLAGS_quic_supports_tls_handshake));
EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_47));
- EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48));
+ EXPECT_FALSE(GetQuicReloadableFlag(quic_enable_version_48_2));
EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_99));
}
}
