зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1373525 - media/mtransport: Remove unused member functions and unused member variable trickled_. r=drno
media/mtransport/test/ice_unittest.cpp:353:12 [-Wunused-member-function] unused member function 'Stream' media/mtransport/test/ice_unittest.cpp:1394:7 [-Wunused-member-function] unused member function 'trickled' media/mtransport/test/ice_unittest.cpp:1867:8 [-Wunused-member-function] unused member function 'SetExpectedTypes' media/mtransport/test/transport_unittests.cpp:917:8 [-Wunused-member-function] unused member function 'InitIce' MozReview-Commit-ID: 70PNtdc92mg --HG-- extra : source : 5dc220c3efd5bd2f8f844eb85887a4bcfabb3990 extra : intermediate-source : 0751fb1b9b19a8451c5aba7e021bcb386962ce5d
This commit is contained in:
Родитель
0a377e9314
Коммит
7dd51821f3
|
@ -350,10 +350,6 @@ class SchedulableTrickleCandidate {
|
||||||
return candidate_;
|
return candidate_;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t Stream() const {
|
|
||||||
return stream_;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsHost() const {
|
bool IsHost() const {
|
||||||
return candidate_.find("typ host") != std::string::npos;
|
return candidate_.find("typ host") != std::string::npos;
|
||||||
}
|
}
|
||||||
|
@ -407,7 +403,6 @@ class IceTestPeer : public sigslot::has_slots<> {
|
||||||
expected_local_transport_(kNrIceTransportUdp),
|
expected_local_transport_(kNrIceTransportUdp),
|
||||||
expected_remote_type_(NrIceCandidate::ICE_HOST),
|
expected_remote_type_(NrIceCandidate::ICE_HOST),
|
||||||
trickle_mode_(TRICKLE_NONE),
|
trickle_mode_(TRICKLE_NONE),
|
||||||
trickled_(0),
|
|
||||||
simulate_ice_lite_(false),
|
simulate_ice_lite_(false),
|
||||||
nat_(new TestNat),
|
nat_(new TestNat),
|
||||||
test_utils_(utils) {
|
test_utils_(utils) {
|
||||||
|
@ -1070,7 +1065,6 @@ class IceTestPeer : public sigslot::has_slots<> {
|
||||||
ASSERT_GT(ctx->GetStreamCount(), i);
|
ASSERT_GT(ctx->GetStreamCount(), i);
|
||||||
nsresult res = ctx->GetStream(i)->ParseTrickleCandidate(candidate);
|
nsresult res = ctx->GetStream(i)->ParseTrickleCandidate(candidate);
|
||||||
ASSERT_TRUE(NS_SUCCEEDED(res));
|
ASSERT_TRUE(NS_SUCCEEDED(res));
|
||||||
++trickled_;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1391,8 +1385,6 @@ class IceTestPeer : public sigslot::has_slots<> {
|
||||||
NS_DISPATCH_SYNC);
|
NS_DISPATCH_SYNC);
|
||||||
}
|
}
|
||||||
|
|
||||||
int trickled() { return trickled_; }
|
|
||||||
|
|
||||||
void SetControlling(NrIceCtx::Controlling controlling) {
|
void SetControlling(NrIceCtx::Controlling controlling) {
|
||||||
nsresult res;
|
nsresult res;
|
||||||
test_utils_->sts_target()->Dispatch(
|
test_utils_->sts_target()->Dispatch(
|
||||||
|
@ -1466,7 +1458,6 @@ class IceTestPeer : public sigslot::has_slots<> {
|
||||||
NrIceCandidate::Type expected_remote_type_;
|
NrIceCandidate::Type expected_remote_type_;
|
||||||
std::string expected_remote_addr_;
|
std::string expected_remote_addr_;
|
||||||
TrickleMode trickle_mode_;
|
TrickleMode trickle_mode_;
|
||||||
int trickled_;
|
|
||||||
bool simulate_ice_lite_;
|
bool simulate_ice_lite_;
|
||||||
RefPtr<mozilla::TestNat> nat_;
|
RefPtr<mozilla::TestNat> nat_;
|
||||||
MtransportTestUtils* test_utils_;
|
MtransportTestUtils* test_utils_;
|
||||||
|
@ -1864,12 +1855,6 @@ class WebRtcIceConnectTest : public StunTest {
|
||||||
p2_->SetExpectedTypes(local, remote, transport);
|
p2_->SetExpectedTypes(local, remote, transport);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetExpectedTypes(NrIceCandidate::Type local1, NrIceCandidate::Type remote1,
|
|
||||||
NrIceCandidate::Type local2, NrIceCandidate::Type remote2) {
|
|
||||||
p1_->SetExpectedTypes(local1, remote1);
|
|
||||||
p2_->SetExpectedTypes(local2, remote2);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetExpectedRemoteCandidateAddr(const std::string& addr) {
|
void SetExpectedRemoteCandidateAddr(const std::string& addr) {
|
||||||
p1_->SetExpectedRemoteCandidateAddr(addr);
|
p1_->SetExpectedRemoteCandidateAddr(addr);
|
||||||
p2_->SetExpectedRemoteCandidateAddr(addr);
|
p2_->SetExpectedRemoteCandidateAddr(addr);
|
||||||
|
|
|
@ -914,11 +914,6 @@ class TransportTest : public MtransportTest {
|
||||||
ASSERT_EQ_WAIT(s2, p2_->state(), 10000);
|
ASSERT_EQ_WAIT(s2, p2_->state(), 10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InitIce() {
|
|
||||||
p1_->InitIce();
|
|
||||||
p2_->InitIce();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ConnectIce() {
|
void ConnectIce() {
|
||||||
p1_->InitIce();
|
p1_->InitIce();
|
||||||
p2_->InitIce();
|
p2_->InitIce();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче