Index: webrtc/p2p/base/transport.h |
diff --git a/webrtc/p2p/base/transport.h b/webrtc/p2p/base/transport.h |
index 13c8431a67d3b23e74c9f6db028879917fad5eb8..9e8a233208d5a70591575cb2cca08dd8bc9c8870 100644 |
--- a/webrtc/p2p/base/transport.h |
+++ b/webrtc/p2p/base/transport.h |
@@ -43,8 +43,6 @@ class PortAllocator; |
class TransportChannel; |
class TransportChannelImpl; |
-typedef std::vector<Candidate> Candidates; |
- |
// TODO(deadbeef): Unify with PeerConnectionInterface::IceConnectionState |
// once /talk/ and /webrtc/ are combined, and also switch to ENUM_NAME naming |
// style. |
@@ -259,11 +257,8 @@ class Transport : public sigslot::has_slots<> { |
// Called when one or more candidates are ready from the remote peer. |
bool AddRemoteCandidates(const std::vector<Candidate>& candidates, |
std::string* error); |
- |
- // If candidate is not acceptable, returns false and sets error. |
- // Call this before calling OnRemoteCandidates. |
- virtual bool VerifyCandidate(const Candidate& candidate, |
- std::string* error); |
+ bool RemoveRemoteCandidates(const std::vector<Candidate>& candidates, |
+ std::string* error); |
virtual bool GetSslRole(rtc::SSLRole* ssl_role) const { return false; } |
@@ -317,6 +312,11 @@ class Transport : public sigslot::has_slots<> { |
std::string* error_desc); |
private: |
+ // If a candidate is not acceptable, returns false and sets error. |
+ // Call this before calling OnRemoteCandidates. |
+ bool VerifyCandidate(const Candidate& candidate, std::string* error); |
+ bool VerifyCandidates(const Candidates& candidates, std::string* error); |
+ |
// Candidate component => TransportChannelImpl* |
typedef std::map<int, TransportChannelImpl*> ChannelMap; |