Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(510)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 1278073004: Roll WebRTC 9687:9692, Libjingle 9690:9692 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove roll part; keep only remoting part Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/chromium_port_allocator.cc ('k') | remoting/test/fake_port_allocator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 86537379d8e4cc4c97889f372863d975aaea08bd..83c59804b7ea0716a14af5d2f6c4438dcd782fb3 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -192,7 +192,6 @@ void LibjingleTransport::DoStart() {
channel_.reset(new cricket::P2PTransportChannel(
std::string(), 0, nullptr, port_allocator_));
std::string ice_password = rtc::CreateRandomString(cricket::ICE_PWD_LENGTH);
- channel_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
channel_->SetIceRole((role_ == TransportRole::CLIENT)
? cricket::ICEROLE_CONTROLLING
: cricket::ICEROLE_CONTROLLED);
« no previous file with comments | « remoting/protocol/chromium_port_allocator.cc ('k') | remoting/test/fake_port_allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698