Fix incorrect flag checks in quic_connection_test.
PiperOrigin-RevId: 472552753
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index f8822e5..b2da24e 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -1877,7 +1877,8 @@
QuicConnectionPeer::SetAddressValidated(&connection_);
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -2081,7 +2082,8 @@
// Sends new server CID to client.
QuicConnectionId new_cid;
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -2144,7 +2146,8 @@
// Sends new server CID to client.
QuicConnectionId new_cid;
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -2217,7 +2220,8 @@
QuicConnectionId server_cid0 = connection_.connection_id();
QuicConnectionId server_cid1;
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -13322,7 +13326,8 @@
QuicConnectionId client_cid1 = TestConnectionId(2);
QuicConnectionId server_cid1;
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -13475,7 +13480,8 @@
QuicConnectionId server_cid0 = connection_.connection_id();
QuicConnectionId server_cid1;
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -13601,7 +13607,8 @@
QuicConnectionId client_cid1 = TestConnectionId(2);
QuicConnectionId server_cid1;
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -13722,7 +13729,8 @@
QuicConnectionId client_cid1 = TestConnectionId(2);
QuicConnectionId server_cid1;
// Sends new server CID to client.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -13860,7 +13868,8 @@
ASSERT_EQ(packet_creator->GetDestinationConnectionId(), server_cid0);
// Client will issue a new client connection ID to server.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator)) {
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator)) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
}
@@ -14022,7 +14031,8 @@
// Client will issue a new client connection ID to server.
QuicConnectionId new_client_connection_id;
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator)) {
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator)) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
}
@@ -14279,7 +14289,8 @@
set_perspective(Perspective::IS_SERVER);
connection_.CreateConnectionIdManager();
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -14317,7 +14328,8 @@
QuicRetireConnectionIdFrame frame;
frame.sequence_number = 0u;
if (connection_.connection_migration_use_new_cid()) {
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(cid0))
.WillOnce(Return(TestConnectionId(456)));
@@ -14358,7 +14370,8 @@
EXPECT_EQ(connection_.GetOneActiveServerConnectionId(), cid0);
connection_.SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -14394,7 +14407,8 @@
// Packet2 with RetireConnectionId frame trigers sending NewConnectionId
// immediately.
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator) &&
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator) &&
!connection_.connection_id().IsEmpty()) {
EXPECT_CALL(connection_id_generator_, GenerateNextConnectionId(_))
.WillOnce(Return(TestConnectionId(456)));
@@ -14809,7 +14823,8 @@
!connection_.connection_migration_use_new_cid()) {
return;
}
- if (GetQuicRestartFlag(quic_abstract_connection_id_generator)) {
+ if (GetQuicReloadableFlag(
+ quic_connection_uses_abstract_connection_id_generator)) {
EXPECT_CALL(connection_id_generator_,
GenerateNextConnectionId(TestConnectionId(12)))
.WillOnce(Return(TestConnectionId(456)));