Revert "Fix sending wrong candidates down to transportchannel."
This reverts commit f65de8483e90d1d52d5d8f40f646e77bf45b10ea. It was breaking the build bots: http://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/builds/3062 TBR=decurtis BUG= Review URL: https://webrtc-codereview.appspot.com/54539004 Cr-Commit-Position: refs/heads/master@{#9267}
This commit is contained in:
@ -156,9 +156,6 @@ class P2PTransportChannel : public TransportChannelImpl,
|
||||
// Public for unit tests.
|
||||
Connection* FindNextPingableConnection();
|
||||
|
||||
// Public for unit tests only.
|
||||
size_t RemoteCandidateCount() const { return remote_candidates_.size(); }
|
||||
|
||||
private:
|
||||
rtc::Thread* thread() { return worker_thread_; }
|
||||
PortAllocatorSession* allocator_session() {
|
||||
|
||||
@ -259,13 +259,6 @@ bool TransportProxy::OnRemoteCandidates(const Candidates& candidates,
|
||||
// TODO(juberti): Remove this once everybody calls SetLocalTD.
|
||||
CompleteNegotiation();
|
||||
|
||||
// Ignore candidates for if the proxy content_name doesn't match the content
|
||||
// name of the actual transport. This stops video candidates from being sent
|
||||
// down to the audio transport when BUNDLE is enabled.
|
||||
if (content_name_ != transport_->get()->content_name()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Verify each candidate before passing down to transport layer.
|
||||
for (Candidates::const_iterator cand = candidates.begin();
|
||||
cand != candidates.end(); ++cand) {
|
||||
|
||||
Reference in New Issue
Block a user