Deprecate quic_google_transport_param_send_new Deprecate gfe2_restart_flag_quic_google_transport_param_send_new PiperOrigin-RevId: 320029226 Change-Id: I6e651426a516a8df092862decd02884824de5411
diff --git a/quic/core/quic_config.cc b/quic/core/quic_config.cc index 30a5e2b..d7a9f00 100644 --- a/quic/core/quic_config.cc +++ b/quic/core/quic_config.cc
@@ -1203,16 +1203,13 @@ retry_source_connection_id_to_send_.value(); } - if (GetQuicRestartFlag(quic_google_transport_param_send_new)) { - QUIC_RESTART_FLAG_COUNT_N(quic_google_transport_param_send_new, 1, 3); - if (initial_round_trip_time_us_.HasSendValue()) { - params->initial_round_trip_time_us.set_value( - initial_round_trip_time_us_.GetSendValue()); - } - if (connection_options_.HasSendValues() && - !connection_options_.GetSendValues().empty()) { - params->google_connection_options = connection_options_.GetSendValues(); - } + if (initial_round_trip_time_us_.HasSendValue()) { + params->initial_round_trip_time_us.set_value( + initial_round_trip_time_us_.GetSendValue()); + } + if (connection_options_.HasSendValues() && + !connection_options_.GetSendValues().empty()) { + params->google_connection_options = connection_options_.GetSendValues(); } if (!GetQuicRestartFlag(quic_google_transport_param_omit_old)) { @@ -1337,18 +1334,15 @@ } bool google_params_already_parsed = false; - if (GetQuicRestartFlag(quic_google_transport_param_send_new)) { - QUIC_RESTART_FLAG_COUNT_N(quic_google_transport_param_send_new, 2, 3); - if (params.initial_round_trip_time_us.value() > 0) { - google_params_already_parsed = true; - initial_round_trip_time_us_.SetReceivedValue( - params.initial_round_trip_time_us.value()); - } - if (params.google_connection_options.has_value()) { - google_params_already_parsed = true; - connection_options_.SetReceivedValues( - params.google_connection_options.value()); - } + if (params.initial_round_trip_time_us.value() > 0) { + google_params_already_parsed = true; + initial_round_trip_time_us_.SetReceivedValue( + params.initial_round_trip_time_us.value()); + } + if (params.google_connection_options.has_value()) { + google_params_already_parsed = true; + connection_options_.SetReceivedValues( + params.google_connection_options.value()); } if (!GetQuicRestartFlag(quic_google_transport_param_omit_old)) {
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc index 23a74e4..7d000d9 100644 --- a/quic/core/tls_client_handshaker.cc +++ b/quic/core/tls_client_handshaker.cc
@@ -208,10 +208,8 @@ if (!handshaker_delegate()->FillTransportParameters(¶ms)) { return false; } - if (GetQuicRestartFlag(quic_google_transport_param_send_new)) { - if (!user_agent_id_.empty()) { - params.user_agent_id = user_agent_id_; - } + if (!user_agent_id_.empty()) { + params.user_agent_id = user_agent_id_; } if (!GetQuicRestartFlag(quic_google_transport_param_omit_old)) { params.google_quic_params->SetStringPiece(kUAID, user_agent_id_);