Merge SignalPortPruned with SignalPortsRemoved in PortAllocatorSession

webrtc/p2p/base/portallocator.h

Index: webrtc/p2p/base/portallocator.h
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index 152474d4f4476b5fc3060bb092e9f83cebd9aac3..5deae7f736dcc71529fa897f3d3fe69e84719117 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -191,11 +191,12 @@ class PortAllocatorSession : public sigslot::has_slots<> {
   virtual bool CandidatesAllocationDone() const = 0;
 
   sigslot::signal2<PortAllocatorSession*, PortInterface*> SignalPortReady;
-  // Ports should be signaled to be removed when the networks of the ports
-  // failed (either because the interface is down, or because there is no
-  // connection on the interface).
+  // Fires this signal when the network of the ports failed (either because the
+  // 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*>&>
-      SignalPortsRemoved;
+      SignalPortsPruned;
   sigslot::signal2<PortAllocatorSession*,
                    const std::vector<Candidate>&> SignalCandidatesReady;
   // Candidates should be signaled to be removed when the port that generated
@@ -203,11 +204,6 @@ class PortAllocatorSession : public sigslot::has_slots<> {
   sigslot::signal2<PortAllocatorSession*, const std::vector<Candidate>&>
       SignalCandidatesRemoved;
   sigslot::signal1<PortAllocatorSession*> SignalCandidatesAllocationDone;
-  // A TURN port is pruned if a higher-priority TURN port becomes ready
-  // (pairable). When it is pruned, it will not be used for creating
-  // connections and its candidates will not be sent to the remote side
-  // if they have not been sent.
-  sigslot::signal2<PortAllocatorSession*, PortInterface*> SignalPortPruned;
 
   virtual uint32_t generation() { return generation_; }
   virtual void set_generation(uint32_t generation) { generation_ = generation; }