Index: webrtc/p2p/base/transport_unittest.cc |
diff --git a/webrtc/p2p/base/transport_unittest.cc b/webrtc/p2p/base/transport_unittest.cc |
index 43b761a64c9a07a3cea5fcd10f10b31233271899..7b8df64eabb57883e78e283381f0bd8867f30b73 100644 |
--- a/webrtc/p2p/base/transport_unittest.cc |
+++ b/webrtc/p2p/base/transport_unittest.cc |
@@ -107,7 +107,8 @@ TEST_F(TransportTest, TestDestroyAllClearsPosts) { |
TEST_F(TransportTest, TestChannelIceParameters) { |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
transport_->SetIceTiebreaker(99U); |
- cricket::TransportDescription local_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(local_desc, |
cricket::CA_OFFER, |
NULL)); |
@@ -118,7 +119,8 @@ TEST_F(TransportTest, TestChannelIceParameters) { |
EXPECT_EQ(kIceUfrag1, channel_->ice_ufrag()); |
EXPECT_EQ(kIcePwd1, channel_->ice_pwd()); |
- cricket::TransportDescription remote_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription remote_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc, |
cricket::CA_ANSWER, |
NULL)); |
@@ -148,7 +150,8 @@ TEST_F(TransportTest, TestIceControlledToControllingOnIceRestart) { |
EXPECT_TRUE(SetupChannel()); |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLED); |
- cricket::TransportDescription desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(desc, |
cricket::CA_OFFER, |
NULL)); |
@@ -157,7 +160,8 @@ TEST_F(TransportTest, TestIceControlledToControllingOnIceRestart) { |
NULL)); |
EXPECT_EQ(cricket::ICEROLE_CONTROLLED, transport_->ice_role()); |
- cricket::TransportDescription new_local_desc(kIceUfrag2, kIcePwd2); |
+ cricket::TransportDescription new_local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag2, kIcePwd2); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(new_local_desc, |
cricket::CA_OFFER, |
NULL)); |
@@ -171,7 +175,8 @@ TEST_F(TransportTest, TestIceControllingToControlledOnIceRestart) { |
EXPECT_TRUE(SetupChannel()); |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
- cricket::TransportDescription desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(desc, |
cricket::CA_OFFER, |
NULL)); |
@@ -180,7 +185,8 @@ TEST_F(TransportTest, TestIceControllingToControlledOnIceRestart) { |
NULL)); |
EXPECT_EQ(cricket::ICEROLE_CONTROLLING, transport_->ice_role()); |
- cricket::TransportDescription new_local_desc(kIceUfrag2, kIcePwd2); |
+ cricket::TransportDescription new_local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag2, kIcePwd2); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(new_local_desc, |
cricket::CA_ANSWER, |
NULL)); |
@@ -194,13 +200,14 @@ TEST_F(TransportTest, TestIceControllingOnIceRestartIfRemoteIsIceLite) { |
EXPECT_TRUE(SetupChannel()); |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
- cricket::TransportDescription desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(desc, |
cricket::CA_OFFER, |
NULL)); |
cricket::TransportDescription remote_desc( |
- std::vector<std::string>(), |
+ cricket::NS_JINGLE_ICE_UDP, std::vector<std::string>(), |
kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE, |
cricket::CONNECTIONROLE_NONE, NULL, cricket::Candidates()); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc, |
@@ -209,7 +216,8 @@ TEST_F(TransportTest, TestIceControllingOnIceRestartIfRemoteIsIceLite) { |
EXPECT_EQ(cricket::ICEROLE_CONTROLLING, transport_->ice_role()); |
- cricket::TransportDescription new_local_desc(kIceUfrag2, kIcePwd2); |
+ cricket::TransportDescription new_local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag2, kIcePwd2); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(new_local_desc, |
cricket::CA_ANSWER, |
NULL)); |
@@ -220,13 +228,15 @@ TEST_F(TransportTest, TestIceControllingOnIceRestartIfRemoteIsIceLite) { |
// This test verifies that the Completed and Failed states can be reached. |
TEST_F(TransportTest, TestChannelCompletedAndFailed) { |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
- cricket::TransportDescription local_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(local_desc, |
cricket::CA_OFFER, |
NULL)); |
EXPECT_TRUE(SetupChannel()); |
- cricket::TransportDescription remote_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription remote_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc, |
cricket::CA_ANSWER, |
NULL)); |
@@ -256,13 +266,14 @@ TEST_F(TransportTest, TestChannelCompletedAndFailed) { |
TEST_F(TransportTest, TestSetRemoteIceLiteInOffer) { |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLED); |
cricket::TransportDescription remote_desc( |
- std::vector<std::string>(), |
+ cricket::NS_JINGLE_ICE_UDP, std::vector<std::string>(), |
kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE, |
cricket::CONNECTIONROLE_ACTPASS, NULL, cricket::Candidates()); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc, |
cricket::CA_OFFER, |
NULL)); |
- cricket::TransportDescription local_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(local_desc, |
cricket::CA_ANSWER, |
NULL)); |
@@ -275,7 +286,8 @@ TEST_F(TransportTest, TestSetRemoteIceLiteInOffer) { |
// Tests ice-lite in remote answer. |
TEST_F(TransportTest, TestSetRemoteIceLiteInAnswer) { |
transport_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
- cricket::TransportDescription local_desc(kIceUfrag1, kIcePwd1); |
+ cricket::TransportDescription local_desc( |
+ cricket::NS_JINGLE_ICE_UDP, kIceUfrag1, kIcePwd1); |
ASSERT_TRUE(transport_->SetLocalTransportDescription(local_desc, |
cricket::CA_OFFER, |
NULL)); |
@@ -285,7 +297,7 @@ TEST_F(TransportTest, TestSetRemoteIceLiteInAnswer) { |
// Channels will be created in ICEFULL_MODE. |
EXPECT_EQ(cricket::ICEMODE_FULL, channel_->remote_ice_mode()); |
cricket::TransportDescription remote_desc( |
- std::vector<std::string>(), |
+ cricket::NS_JINGLE_ICE_UDP, std::vector<std::string>(), |
kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE, |
cricket::CONNECTIONROLE_NONE, NULL, cricket::Candidates()); |
ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc, |