commit 716c8eb942a74ad641bbace8c1db521b4857c636
author Harald Alvestrand <hta@webrtc.org> Mon Oct 06 12:50:26 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 06 14:43:39 2025
tree 83774bda8221883535f5a8d9414544f81608335a
parent 9cc0240c15421f269a526f13474ee31485c605fb

Revert "Add instructions for removing a Trampoline-wrapped Signal"

This reverts commit bb6b3aab159ebcd825526cf831f54170ccb2584d.

Reason for revert: Need to fix downstream Chromium issues.

Original change's description:
> Add instructions for removing a Trampoline-wrapped Signal
>
> Also apply the instructions to one Signal.
>
> Bug: webrtc:42222066
> Change-Id: I63409d968d27a843b0ac7c61a122a1b685cb7a6f
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/408883
> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#45624}

Bug: webrtc:42222066, chromium:449225599
No-IWYU: Revert
Change-Id: I7fdf1694664b11ffcfd91916f1e98ef88254059d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/413923
Auto-Submit: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Guido Urdaneta <guidou@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45840}

p2p/base/ice_transport_internal.cc

diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc
index 7843a8b..a4b96db 100644
--- a/p2p/base/ice_transport_internal.cc
+++ b/p2p/base/ice_transport_internal.cc
@@ -236,7 +236,8 @@
 }
 
 IceTransportInternal::IceTransportInternal()
-    : role_conflict_trampoline_(this),
+    : candidate_gathered_trampoline_(this),
+      role_conflict_trampoline_(this),
       ice_transport_state_changed_trampoline_(this),
       destroyed_trampoline_(this) {}
 
@@ -265,7 +266,7 @@
 void IceTransportInternal::SubscribeCandidateGathered(
     absl::AnyInvocable<void(IceTransportInternal*, const Candidate&)>
         callback) {
-  candidate_gathered_callbacks_.AddReceiver(std::move(callback));
+  candidate_gathered_trampoline_.Subscribe(std::move(callback));
 }
 
 void IceTransportInternal::SubscribeRoleConflict(

p2p/base/ice_transport_internal.h

diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h
index 04f6e35..25a99fe 100644
--- a/p2p/base/ice_transport_internal.h
+++ b/p2p/base/ice_transport_internal.h
@@ -352,9 +352,11 @@
   void RemoveGatheringStateCallback(const void* removal_tag);
 
   // Handles sending and receiving of candidates.
+  sigslot::signal2<IceTransportInternal*, const Candidate&>
+      SignalCandidateGathered;
   void NotifyCandidateGathered(IceTransportInternal* transport,
                                const Candidate& candidate) {
-    candidate_gathered_callbacks_.Send(transport, candidate);
+    SignalCandidateGathered(transport, candidate);
   }
   void SubscribeCandidateGathered(
       absl::AnyInvocable<void(IceTransportInternal*, const Candidate&)>
@@ -454,8 +456,9 @@
       candidate_pair_change_callback_;
 
  private:
-  CallbackList<IceTransportInternal*, const Candidate&>
-      candidate_gathered_callbacks_;
+  SignalTrampoline<IceTransportInternal,
+                   &IceTransportInternal::SignalCandidateGathered>
+      candidate_gathered_trampoline_;
   SignalTrampoline<IceTransportInternal,
                    &IceTransportInternal::SignalRoleConflict>
       role_conflict_trampoline_;

rtc_base/sigslot_trampoline.h

diff --git a/rtc_base/sigslot_trampoline.h b/rtc_base/sigslot_trampoline.h
index a399e41..590e73d 100644
--- a/rtc_base/sigslot_trampoline.h
+++ b/rtc_base/sigslot_trampoline.h
@@ -51,18 +51,6 @@
 //     my_class_object.SubscibeMyNamedEvent(
 //         SafeInvocable(target.safety_flag_.flag(),
 //                       [target] { target.function(); }
-// WHEN REMOVING THE SIGNAL
-// Make a CL that will:
-// - Delete the SignalMyNamedEvent signal
-// - Change my_named_event_trampoline_ to my_named_event_callbacks,
-//   of type CallbackList<function arguments>
-// - Change SubscribeMyNamedEvent to call my_named_event_callbacks.AddReceiver
-// - Change NotifyMyNamedEvent to call my_named_event_callbacks_.Send
-// - If UnsubscribeMyNamedEvent exists, change that also.
-// - Delete the initialization of my_named_event_trampoline_ from the
-//   relevant constructor.
-// Sending this through the bots will flush out remaining references to
-// SignalMyNamedEvent.
 namespace internal {
 template <typename MemberPtrT>
 struct member_pointer_traits;