Merge SignalPortPruned and SignalPortsRemoved.
These two signals have the same purpose and is kind of redundant.
Rename to SignalPortsPruned.
BUG=
R=pthatcher@webrtc.org, zhihuang@webrtc.org
Review URL: https://codereview.webrtc.org/2176743003 .
Cr-Commit-Position: refs/heads/master@{#13562}
diff --git a/webrtc/p2p/client/basicportallocator_unittest.cc b/webrtc/p2p/client/basicportallocator_unittest.cc
index 4696f23..9f91aa0 100644
--- a/webrtc/p2p/client/basicportallocator_unittest.cc
+++ b/webrtc/p2p/client/basicportallocator_unittest.cc
@@ -239,8 +239,8 @@
sid, content_name, component, ice_ufrag, ice_pwd);
session->SignalPortReady.connect(this,
&BasicPortAllocatorTest::OnPortReady);
- session->SignalPortPruned.connect(this,
- &BasicPortAllocatorTest::OnPortPruned);
+ session->SignalPortsPruned.connect(this,
+ &BasicPortAllocatorTest::OnPortsPruned);
session->SignalCandidatesReady.connect(
this, &BasicPortAllocatorTest::OnCandidatesReady);
session->SignalCandidatesAllocationDone.connect(
@@ -415,13 +415,18 @@
EXPECT_NE(ready_ports.end(),
std::find(ready_ports.begin(), ready_ports.end(), port));
}
- void OnPortPruned(PortAllocatorSession* ses, PortInterface* port) {
- LOG(LS_INFO) << "OnPortPruned: " << port->ToString();
- ports_.erase(std::remove(ports_.begin(), ports_.end(), port), ports_.end());
- // Make sure the pruned port is not in ReadyPorts.
+ void OnPortsPruned(PortAllocatorSession* ses,
+ const std::vector<PortInterface*>& ports_pruned) {
+ LOG(LS_INFO) << "Number of ports pruned: " << ports_pruned.size();
auto ready_ports = ses->ReadyPorts();
- EXPECT_EQ(ready_ports.end(),
- std::find(ready_ports.begin(), ready_ports.end(), port));
+ auto new_end = ports_.end();
+ for (PortInterface* port : ports_pruned) {
+ new_end = std::remove(ports_.begin(), new_end, port);
+ // Make sure the pruned port is not in ReadyPorts.
+ EXPECT_EQ(ready_ports.end(),
+ std::find(ready_ports.begin(), ready_ports.end(), port));
+ }
+ ports_.erase(new_end, ports_.end());
}
void OnCandidatesReady(PortAllocatorSession* ses,