| Index: webrtc/p2p/base/transport_unittest.cc
|
| diff --git a/webrtc/p2p/base/transport_unittest.cc b/webrtc/p2p/base/transport_unittest.cc
|
| index 1f66a47c992f47eadb19d8e56975cb01442ae4de..96ebc5eb50686b9c89707787823989b9dba83fcb 100644
|
| --- a/webrtc/p2p/base/transport_unittest.cc
|
| +++ b/webrtc/p2p/base/transport_unittest.cc
|
| @@ -14,8 +14,6 @@
|
| #include "webrtc/p2p/base/faketransportcontroller.h"
|
| #include "webrtc/p2p/base/p2ptransport.h"
|
|
|
| -using cricket::Candidate;
|
| -using cricket::Candidates;
|
| using cricket::Transport;
|
| using cricket::FakeTransport;
|
| using cricket::TransportChannel;
|
| @@ -155,9 +153,8 @@ TEST_F(TransportTest, TestIceControllingOnIceRestartIfRemoteIsIceLite) {
|
| NULL));
|
|
|
| cricket::TransportDescription remote_desc(
|
| - std::vector<std::string>(),
|
| - kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| - cricket::CONNECTIONROLE_NONE, NULL, cricket::Candidates());
|
| + std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| + cricket::CONNECTIONROLE_NONE, NULL);
|
| ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc,
|
| cricket::CA_ANSWER,
|
| NULL));
|
| @@ -176,9 +173,8 @@ TEST_F(TransportTest, TestIceControllingOnIceRestartIfRemoteIsIceLite) {
|
| TEST_F(TransportTest, TestSetRemoteIceLiteInOffer) {
|
| transport_->SetIceRole(cricket::ICEROLE_CONTROLLED);
|
| cricket::TransportDescription remote_desc(
|
| - std::vector<std::string>(),
|
| - kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| - cricket::CONNECTIONROLE_ACTPASS, NULL, cricket::Candidates());
|
| + std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| + cricket::CONNECTIONROLE_ACTPASS, NULL);
|
| ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc,
|
| cricket::CA_OFFER,
|
| NULL));
|
| @@ -205,9 +201,8 @@ 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>(),
|
| - kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| - cricket::CONNECTIONROLE_NONE, NULL, cricket::Candidates());
|
| + std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_LITE,
|
| + cricket::CONNECTIONROLE_NONE, NULL);
|
| ASSERT_TRUE(transport_->SetRemoteTransportDescription(remote_desc,
|
| cricket::CA_ANSWER,
|
| NULL));
|
|
|