diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc index 15da627202..f4bfae84d0 100644 --- a/p2p/base/ice_transport_internal.cc +++ b/p2p/base/ice_transport_internal.cc @@ -123,13 +123,7 @@ int IceConfig::stun_keepalive_interval_or_default() const { 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; diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h index 78369c09d2..46717cc230 100644 --- a/p2p/base/ice_transport_internal.h +++ b/p2p/base/ice_transport_internal.h @@ -304,9 +304,6 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal { return absl::nullopt; } - // Signal Exposed for backwards compatibility. - sigslot::signal1 SignalGatheringState; - // Note: These calls must not be inlined in order to avoid linking issues. void AddGatheringStateCallback( const void* removal_tag, absl::AnyInvocable callback); @@ -384,7 +381,9 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal { } protected: - void SendGatheringStateEvent() { SignalGatheringState(this); } + void SendGatheringStateEvent() { + gathering_state_callback_list_.Send(this); + } webrtc::CallbackList 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