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

Unified Diff: webrtc/p2p/base/turnport_unittest.cc

Issue 1353713002: Remove GICE (again). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undo .gclient Created 5 years, 3 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 | « webrtc/p2p/base/transportdescriptionfactory_unittest.cc ('k') | webrtc/p2p/client/basicportallocator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/turnport_unittest.cc
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index b5fab3993edd8933a7a89c7f1e1aa6243b07d069..a90ea032b7498758269e724e58c358ddb67dfbc8 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -201,11 +201,7 @@ class TurnPortTest : public testing::Test,
kIceUfrag1, kIcePwd1,
server_address, credentials, 0,
std::string()));
- // Set ICE protocol type to ICEPROTO_RFC5245, as port by default will be
- // in Hybrid mode. Protocol type is necessary to send correct type STUN ping
- // messages.
// This TURN port will be the controlling.
- turn_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
turn_port_->SetIceRole(cricket::ICEROLE_CONTROLLING);
ConnectSignals();
}
@@ -223,11 +219,7 @@ class TurnPortTest : public testing::Test,
kIceUfrag1, kIcePwd1,
server_address, credentials, 0,
origin));
- // Set ICE protocol type to ICEPROTO_RFC5245, as port by default will be
- // in Hybrid mode. Protocol type is necessary to send correct type STUN ping
- // messages.
// This TURN port will be the controlling.
- turn_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
turn_port_->SetIceRole(cricket::ICEROLE_CONTROLLING);
ConnectSignals();
}
@@ -249,11 +241,7 @@ class TurnPortTest : public testing::Test,
turn_port_.reset(cricket::TurnPort::Create(
main_, &socket_factory_, &network_, socket_.get(),
kIceUfrag1, kIcePwd1, server_address, credentials, 0, std::string()));
- // Set ICE protocol type to ICEPROTO_RFC5245, as port by default will be
- // in Hybrid mode. Protocol type is necessary to send correct type STUN ping
- // messages.
// This TURN port will be the controlling.
- turn_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
turn_port_->SetIceRole(cricket::ICEROLE_CONTROLLING);
ConnectSignals();
}
@@ -273,9 +261,7 @@ class TurnPortTest : public testing::Test,
kLocalAddr2.ipaddr(), 0, 0,
kIceUfrag2, kIcePwd2,
std::string(), false));
- // Set protocol type to RFC5245, as turn port is also in same mode.
// UDP port will be controlled.
- udp_port_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
udp_port_->SetIceRole(cricket::ICEROLE_CONTROLLED);
udp_port_->SignalPortComplete.connect(
this, &TurnPortTest::OnUdpPortComplete);
« no previous file with comments | « webrtc/p2p/base/transportdescriptionfactory_unittest.cc ('k') | webrtc/p2p/client/basicportallocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698