commit b5f0781b9e69da23d8ede8b4b51a056fc56b41d6
author Harald Alvestrand <hta@webrtc.org> Tue Oct 21 09:17:35 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 21 11:43:33 2025
tree bf1f3f89d5f81921232615b3b1f3a99c0340c75a
parent 109bf15d65315c1f246dae1bbcf2fb1c5587c1dc

Make signals in PortAllocatorSession private

This is a preliminary step to deleting them -it flushes out
downstream usages.

Bug: webrtc:42222066
Change-Id: I15e8b46d8d6324f98845f92dee52f7cfd72ef14b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/418861
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45999}

p2p/base/port_allocator.h

diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h
index 658e174..9f31267 100644
--- a/p2p/base/port_allocator.h
+++ b/p2p/base/port_allocator.h
@@ -266,7 +266,6 @@
   // destroyed if no connection is using them.
   virtual void PruneAllPorts() {}
 
-  sigslot::signal2<PortAllocatorSession*, PortInterface*> SignalPortReady;
   void SubscribePortReady(absl::AnyInvocable<void(PortAllocatorSession*,
                                                   PortInterface*)> callback) {
     port_ready_trampoline_.Subscribe(std::move(callback));
@@ -279,8 +278,6 @@
   // interface is down, or because there is no connection on the interface),
   // or when TURN ports are pruned because a higher-priority TURN port becomes
   // ready(pairable).
-  sigslot::signal2<PortAllocatorSession*, const std::vector<PortInterface*>&>
-      SignalPortsPruned;
   void SubscribePortsPruned(
       absl::AnyInvocable<void(PortAllocatorSession*,
                               const std::vector<PortInterface*>&)> callback) {
@@ -291,8 +288,6 @@
     SignalPortsPruned(session, ports);
   }
 
-  sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&>
-      SignalCandidatesReady;
   void SubscribeCandidatesReady(
       absl::AnyInvocable<void(PortAllocatorSession*,
                               const std::vector<Candidate>&)> callback) {
@@ -303,8 +298,6 @@
     SignalCandidatesReady(session, candidates);
   }
 
-  sigslot::signal2<PortAllocatorSession*, const IceCandidateErrorEvent&>
-      SignalCandidateError;
   void SubscribeCandidateError(
       absl::AnyInvocable<void(PortAllocatorSession*,
                               const IceCandidateErrorEvent&)> callback) {
@@ -316,8 +309,6 @@
   }
   // Candidates should be signaled to be removed when the port that generated
   // the candidates is removed.
-  sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&>
-      SignalCandidatesRemoved;
   void SubscribeCandidatesRemoved(
       absl::AnyInvocable<void(PortAllocatorSession*,
                               const std::vector<Candidate>&)> callback) {
@@ -327,7 +318,6 @@
                                const std::vector<Candidate>& candidates) {
     SignalCandidatesRemoved(session, candidates);
   }
-  sigslot::signal1<PortAllocatorSession*> SignalCandidatesAllocationDone;
   void SubscribeCandidatesAllocationDone(
       absl::AnyInvocable<void(PortAllocatorSession*)> callback) {
     candidates_allocation_done_trampoline_.Subscribe(std::move(callback));
@@ -336,8 +326,6 @@
     SignalCandidatesAllocationDone(session);
   }
 
-  sigslot::signal2<PortAllocatorSession*, IceRegatheringReason>
-      SignalIceRegathering;
   void SubscribeIceRegathering(
       absl::AnyInvocable<void(PortAllocatorSession*, IceRegatheringReason)>
           callback) {
@@ -399,24 +387,39 @@
   // SetIceParameters is an implementation detail which only PortAllocator
   // should be able to call.
   friend class PortAllocator;
+
+  // Signals and trampolines.
+  // TODO: issues.webrtc.org/42222066 - Change to just CallbackList
+  sigslot::signal2<PortAllocatorSession*, PortInterface*> SignalPortReady;
   SignalTrampoline<PortAllocatorSession, &PortAllocatorSession::SignalPortReady>
       port_ready_trampoline_;
+  sigslot::signal2<PortAllocatorSession*, const std::vector<PortInterface*>&>
+      SignalPortsPruned;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalPortsPruned>
       ports_pruned_trampoline_;
+  sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&>
+      SignalCandidatesReady;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalCandidatesReady>
       candidates_ready_trampoline_;
+  sigslot::signal2<PortAllocatorSession*, const IceCandidateErrorEvent&>
+      SignalCandidateError;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalCandidateError>
       candidate_error_trampoline_;
+  sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&>
+      SignalCandidatesRemoved;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalCandidatesRemoved>
       candidates_removed_trampoline_;
+  sigslot::signal1<PortAllocatorSession*> SignalCandidatesAllocationDone;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalCandidatesAllocationDone>
       candidates_allocation_done_trampoline_;
 
+  sigslot::signal2<PortAllocatorSession*, IceRegatheringReason>
+      SignalIceRegathering;
   SignalTrampoline<PortAllocatorSession,
                    &PortAllocatorSession::SignalIceRegathering>
       ice_regathering_trampoline_;