commit c95cb6bd3e221cd54d3060654abf91abc9a2fac5
author Per K <perkj@webrtc.org> Fri Apr 19 06:22:27 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 19 08:05:25 2024
tree 63a311be136c487838db94b747cd5485314e840f
parent 299b28569682198aed2b2635f2405c6e7db471ba

Remove unused WebRTC-Bwe-InjectedCongestionController

Instead, PeerConnectionFactoryDependencies.network_controller_factory is
used if it exists.

Bug: webrtc:8415
Change-Id: I37d5cc7325072bf1d87993e53949f1b97c277f55
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347860
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42120}

experiments/field_trials.py

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 9bdcb58..468b94e 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -502,9 +502,6 @@
     FieldTrial('WebRTC-Bwe-InitialProbing',
                'webrtc:10394',
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-Bwe-InjectedCongestionController',
-               'webrtc:8415',
-               INDEFINITE),
     FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate',
                'webrtc:11498',
                date(2024, 4, 1)),
@@ -884,7 +881,7 @@
 ])  # yapf: disable
 
 POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
-    '263c7a29291a7c4472ff60c7c3b2520f6dd5cea8'
+    '0b9e14e036ffd4b96ef5e4d6a6aa67b6a1eff11f'
 
 REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
     POLICY_EXEMPT_FIELD_TRIALS)

pc/peer_connection_factory.cc

diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index 6bf0ef9..92fdfc8 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -335,14 +335,13 @@
       network_state_predictor_factory_.get();
   call_config.neteq_factory = neteq_factory_.get();
 
-  if (IsTrialEnabled("WebRTC-Bwe-InjectedCongestionController")) {
+  if (injected_network_controller_factory_) {
     RTC_LOG(LS_INFO) << "Using injected network controller factory";
     call_config.network_controller_factory =
         injected_network_controller_factory_.get();
   } else {
     RTC_LOG(LS_INFO) << "Using default network controller factory";
   }
-
   call_config.rtp_transport_controller_send_factory =
       transport_controller_send_factory_.get();
   call_config.decode_metronome = decode_metronome_.get();