Remove all untagged Subscribe methods Bug: webrtc:465197113 Change-Id: Iafb4042dcc1c9e41ff8d222af8bb68b9011e0b0a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/482720 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48040}
diff --git a/p2p/base/port.cc b/p2p/base/port.cc index ad5aa25..e26461d 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc
@@ -299,12 +299,6 @@ } } -[[deprecated]] void Port::SubscribePortComplete( - absl::AnyInvocable<void(Port*)> callback) { - RTC_DCHECK_RUN_ON(thread_); - port_complete_callback_list_.AddReceiver(std::move(callback)); -} - void Port::SubscribePortComplete(const void* tag, absl::AnyInvocable<void(Port*)> callback) { RTC_DCHECK_RUN_ON(thread_); @@ -324,24 +318,12 @@ } void Port::SubscribeCandidateReadyCallback( - absl::AnyInvocable<void(Port*, const Candidate&)> callback) { - RTC_DCHECK_RUN_ON(thread_); - candidate_ready_callback_list_.AddReceiver(std::move(callback)); -} - -void Port::SubscribeCandidateReadyCallback( const void* tag, absl::AnyInvocable<void(Port*, const Candidate&)> callback) { RTC_DCHECK_RUN_ON(thread_); candidate_ready_callback_list_.AddReceiver(tag, std::move(callback)); } -[[deprecated]] void Port::SubscribePortError( - absl::AnyInvocable<void(Port*)> callback) { - RTC_DCHECK_RUN_ON(thread_); - port_error_callback_list_.AddReceiver(std::move(callback)); -} - void Port::SubscribePortError(const void* tag, absl::AnyInvocable<void(Port*)> callback) { RTC_DCHECK_RUN_ON(thread_); @@ -880,12 +862,6 @@ } } -[[deprecated]] void Port::SubscribePortDestroyed( - std::function<void(PortInterface*)> callback) { - RTC_DCHECK_RUN_ON(thread_); - port_destroyed_callback_list_.AddReceiver(std::move(callback)); -} - void Port::SubscribePortDestroyed( const void* tag, std::function<void(PortInterface*)> callback) {
diff --git a/p2p/base/port.h b/p2p/base/port.h index 8b4baed..4ef1c63 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h
@@ -268,9 +268,6 @@ // Fired when candidates are discovered by the port. When all candidates // are discovered that belong to port SignalAddressReady is fired. - [[deprecated("Use SubscribeCandidateReadyCallback(const void* tag, ...)")]] - void SubscribeCandidateReadyCallback( - absl::AnyInvocable<void(Port*, const Candidate&)> callback); void SubscribeCandidateReadyCallback( const void* tag, absl::AnyInvocable<void(Port*, const Candidate&)> callback); @@ -289,8 +286,6 @@ // SignalPortComplete is sent when port completes the task of candidates // allocation. - [[deprecated("Use SubscribePortComplete(const void* tag, ...)")]] - void SubscribePortComplete(absl::AnyInvocable<void(Port*)> callback); void SubscribePortComplete(const void* tag, absl::AnyInvocable<void(Port*)> callback); void NotifyPortComplete(Port* port) { @@ -303,8 +298,6 @@ // and port fails to allocate one of the candidates, port shouldn't send // this signal as other candidates might be usefull in establishing the // connection. - [[deprecated("Use SubscribePortError(const void* tag, ...)")]] - void SubscribePortError(absl::AnyInvocable<void(Port*)> callback); void SubscribePortError(const void* tag, absl::AnyInvocable<void(Port*)> callback); void NotifyPortError(Port* port) { @@ -312,9 +305,6 @@ port_error_callback_list_.Send(this); } - [[deprecated("Use SubscribePortDestroyed(const void* tag, ...)")]] - void SubscribePortDestroyed( - std::function<void(PortInterface*)> callback) override; void SubscribePortDestroyed( const void* tag, std::function<void(PortInterface*)> callback) override;
diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h index 6b9f69a..24c9cce 100644 --- a/p2p/base/port_interface.h +++ b/p2p/base/port_interface.h
@@ -145,9 +145,6 @@ // Signaled when this port decides to delete itself because it no longer has // any usefulness. - [[deprecated("Use SubscribePortDestroyed(const void* tag, ...)")]] - virtual void SubscribePortDestroyed( - std::function<void(PortInterface*)> callback) = 0; virtual void SubscribePortDestroyed( const void* tag, std::function<void(PortInterface*)> callback) = 0;