Deprecate --gfe2_reloadable_flag_quic_connection_set_initial_self_address.
PiperOrigin-RevId: 344814787
Change-Id: Ie1b796bfd255ed5250074f9492c5a62a5642ad8c
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 00fa44c..e0abf37 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -259,10 +259,7 @@
server_connection_id_(server_connection_id),
client_connection_id_(EmptyQuicConnectionId()),
client_connection_id_is_set_(false),
- self_address_(
- GetQuicReloadableFlag(quic_connection_set_initial_self_address)
- ? initial_self_address
- : QuicSocketAddress()),
+ self_address_(initial_self_address),
peer_address_(initial_peer_address),
direct_peer_address_(initial_peer_address),
active_effective_peer_migration_type_(NO_CHANGE),
@@ -359,11 +356,10 @@
GetQuicReloadableFlag(quic_use_encryption_level_context)),
path_validator_(alarm_factory_, &arena_, this, random_generator_) {
QUIC_BUG_IF(!start_peer_migration_earlier_ && send_path_response_);
- if (GetQuicReloadableFlag(quic_connection_set_initial_self_address)) {
- DCHECK(perspective_ == Perspective::IS_CLIENT ||
- self_address_.IsInitialized());
- QUIC_RELOADABLE_FLAG_COUNT(quic_connection_set_initial_self_address);
- }
+
+ DCHECK(perspective_ == Perspective::IS_CLIENT ||
+ self_address_.IsInitialized());
+
if (enable_aead_limits_) {
QUIC_RELOADABLE_FLAG_COUNT(quic_enable_aead_limits);
}
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index b8ed351..470fa45 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -16,7 +16,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_support_max_bootstrap_cwnd, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_use_bytes_delivered, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_can_send_ack_frequency, true)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_connection_set_initial_self_address, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_conservative_bursts, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_deallocate_message_right_after_sent, true)
