commit 4fc23457aa187e47373ca7abd69da782c985a360
author Harald Alvestrand <hta@webrtc.org> Tue Apr 23 14:47:21 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 23 20:10:03 2024
tree 2d0ee14c30cd9353feb0f714a31af9661a2d1481
parent f1847a101dab9be29856ae9f63919546473aecd5

Remove IceTransportInternal::SignalGatheringState

Landing when last remaining usage in Chrome has been removed.

Bug: webrtc:11943
Change-Id: I62817e2cc0b67113126b82424b6f843c77e66f31
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/341001
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42157}

p2p/base/ice_transport_internal.cc

diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc
index 15da627..f4bfae8 100644
--- a/p2p/base/ice_transport_internal.cc
+++ b/p2p/base/ice_transport_internal.cc
@@ -123,13 +123,7 @@
   return stun_keepalive_interval.value_or(STUN_KEEPALIVE_INTERVAL);
 }
 
-IceTransportInternal::IceTransportInternal() {
-  // Set up detector for use of SignalGatheringState rather than
-  // SetGatheringStateCallback, and behave accordingly
-  // TODO(bugs.webrtc.org/11943): remove when Signal removed
-  SignalGatheringState.connect(
-      this, &IceTransportInternal::SignalGatheringStateFired);
-}
+IceTransportInternal::IceTransportInternal() {}
 
 IceTransportInternal::~IceTransportInternal() = default;
 

p2p/base/ice_transport_internal.h

diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h
index 78369c0..46717cc 100644
--- a/p2p/base/ice_transport_internal.h
+++ b/p2p/base/ice_transport_internal.h
@@ -304,9 +304,6 @@
     return absl::nullopt;
   }
 
-  // Signal Exposed for backwards compatibility.
-  sigslot::signal1<IceTransportInternal*> SignalGatheringState;
-  // Note: These calls must not be inlined in order to avoid linking issues.
   void AddGatheringStateCallback(
       const void* removal_tag,
       absl::AnyInvocable<void(IceTransportInternal*)> callback);
@@ -384,7 +381,9 @@
   }
 
  protected:
-  void SendGatheringStateEvent() { SignalGatheringState(this); }
+  void SendGatheringStateEvent() {
+    gathering_state_callback_list_.Send(this);
+  }
 
   webrtc::CallbackList<IceTransportInternal*,
                        const StunDictionaryView&,
@@ -403,12 +402,6 @@
 
   absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)>
       candidate_pair_change_callback_;
-
- private:
-  // TODO(bugs.webrtc.org/11943): remove when removing Signal
-  void SignalGatheringStateFired(IceTransportInternal* transport) {
-    gathering_state_callback_list_.Send(transport);
-  }
 };
 
 }  // namespace cricket