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..9e93953e7e3c44e79ea0e4a02e9c16306ded93d5 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -193,7 +193,8 @@ class PortAllocatorSession : public sigslot::has_slots<> {
   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).
+  // connection on the interface), or when TURN ports are pruned because a
+  // higher-priority TURN port becomes ready(pairable).

[Zhi Huang, 2016/07/26 04:42:17]

Considering your the other pending CL, the port removal related one
(https://codereview.webrtc.org/2171183002/), I think the comment "or because
these is no connection on the interface" should be modified to be more accurate.
Please correct me if I am wrong.

[honghaiz3, 2016/07/27 21:31:26]

Probably the name is confusing. Here removal does not mean destroying the port.
It only means removing from usage. When there is no connection on the interface,
we will regathering and before the regathering, we SignalPortsPruned on the
ports using the failed interface. 

   sigslot::signal2<PortAllocatorSession*, const std::vector<PortInterface*>&>
       SignalPortsRemoved;
   sigslot::signal2<PortAllocatorSession*,
@@ -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; }