From 4f642c11f870287f8856da32ad401a4cf3705829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= <sprang@webrtc.org>
Date: Tue, 14 Feb 2023 16:50:00 +0100
Subject: [PATCH] Remove WebRTC-TaskQueuePacer trial.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes the last unused field trial parameters, the legacy pacer code
was removed some time ago so the main flag feature has been a noop
since then.

Bug: None
Change-Id: I5266d54fccb4c5fde05a6895072cd76cd5f7fbd9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293349
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Auto-Submit: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39310}
---
 call/rtp_transport_controller_send.cc | 13 ++-----------
 call/rtp_transport_controller_send.h  |  8 --------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc
index 940dff7894..0b467b733a 100644
--- a/call/rtp_transport_controller_send.cc
+++ b/call/rtp_transport_controller_send.cc
@@ -70,14 +70,6 @@ bool IsRelayed(const rtc::NetworkRoute& route) {
 }
 }  // namespace
 
-RtpTransportControllerSend::PacerSettings::PacerSettings(
-    const FieldTrialsView& trials)
-    : holdback_window("holdback_window", TimeDelta::Millis(5)),
-      holdback_packets("holdback_packets", 3) {
-  ParseFieldTrial({&holdback_window, &holdback_packets},
-                  trials.Lookup("WebRTC-TaskQueuePacer"));
-}
-
 RtpTransportControllerSend::RtpTransportControllerSend(
     Clock* clock,
     const RtpTransportConfig& config)
@@ -86,13 +78,12 @@ RtpTransportControllerSend::RtpTransportControllerSend(
       task_queue_factory_(config.task_queue_factory),
       bitrate_configurator_(config.bitrate_config),
       pacer_started_(false),
-      pacer_settings_(*config.trials),
       pacer_(clock,
              &packet_router_,
              *config.trials,
              config.task_queue_factory,
-             pacer_settings_.holdback_window.Get(),
-             pacer_settings_.holdback_packets.Get(),
+             TimeDelta::Millis(5),
+             3,
              config.pacer_burst_interval),
       observer_(nullptr),
       controller_factory_override_(config.network_controller_factory),
diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h
index 51bda73445..9b41a0a413 100644
--- a/call/rtp_transport_controller_send.h
+++ b/call/rtp_transport_controller_send.h
@@ -123,13 +123,6 @@ class RtpTransportControllerSend final
   void OnRemoteNetworkEstimate(NetworkStateEstimate estimate) override;
 
  private:
-  struct PacerSettings {
-    explicit PacerSettings(const FieldTrialsView& trials);
-
-    FieldTrialParameter<TimeDelta> holdback_window;
-    FieldTrialParameter<int> holdback_packets;
-  };
-
   void MaybeCreateControllers() RTC_RUN_ON(task_queue_);
   void UpdateInitialConstraints(TargetRateConstraints new_contraints)
       RTC_RUN_ON(task_queue_);
@@ -159,7 +152,6 @@ class RtpTransportControllerSend final
   RtpBitrateConfigurator bitrate_configurator_;
   std::map<std::string, rtc::NetworkRoute> network_routes_;
   bool pacer_started_;
-  const PacerSettings pacer_settings_;
   TaskQueuePacedSender pacer_;
 
   TargetTransferRateObserver* observer_ RTC_GUARDED_BY(task_queue_);