From 7dd51821f3789143326c1c4cd5e64e56f2953fbe Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sun, 11 Jun 2017 00:09:42 -0700 Subject: [PATCH] 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 --- media/mtransport/test/ice_unittest.cpp | 15 --------------- media/mtransport/test/transport_unittests.cpp | 5 ----- 2 files changed, 20 deletions(-) diff --git a/media/mtransport/test/ice_unittest.cpp b/media/mtransport/test/ice_unittest.cpp index fe858168041b..977ca49348e3 100644 --- a/media/mtransport/test/ice_unittest.cpp +++ b/media/mtransport/test/ice_unittest.cpp @@ -350,10 +350,6 @@ class SchedulableTrickleCandidate { return candidate_; } - size_t Stream() const { - return stream_; - } - bool IsHost() const { return candidate_.find("typ host") != std::string::npos; } @@ -407,7 +403,6 @@ class IceTestPeer : public sigslot::has_slots<> { expected_local_transport_(kNrIceTransportUdp), expected_remote_type_(NrIceCandidate::ICE_HOST), trickle_mode_(TRICKLE_NONE), - trickled_(0), simulate_ice_lite_(false), nat_(new TestNat), test_utils_(utils) { @@ -1070,7 +1065,6 @@ class IceTestPeer : public sigslot::has_slots<> { ASSERT_GT(ctx->GetStreamCount(), i); nsresult res = ctx->GetStream(i)->ParseTrickleCandidate(candidate); ASSERT_TRUE(NS_SUCCEEDED(res)); - ++trickled_; return; } } @@ -1391,8 +1385,6 @@ class IceTestPeer : public sigslot::has_slots<> { NS_DISPATCH_SYNC); } - int trickled() { return trickled_; } - void SetControlling(NrIceCtx::Controlling controlling) { nsresult res; test_utils_->sts_target()->Dispatch( @@ -1466,7 +1458,6 @@ class IceTestPeer : public sigslot::has_slots<> { NrIceCandidate::Type expected_remote_type_; std::string expected_remote_addr_; TrickleMode trickle_mode_; - int trickled_; bool simulate_ice_lite_; RefPtr nat_; MtransportTestUtils* test_utils_; @@ -1864,12 +1855,6 @@ class WebRtcIceConnectTest : public StunTest { 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) { p1_->SetExpectedRemoteCandidateAddr(addr); p2_->SetExpectedRemoteCandidateAddr(addr); diff --git a/media/mtransport/test/transport_unittests.cpp b/media/mtransport/test/transport_unittests.cpp index ceee4509a90f..49184e7d5cdd 100644 --- a/media/mtransport/test/transport_unittests.cpp +++ b/media/mtransport/test/transport_unittests.cpp @@ -914,11 +914,6 @@ class TransportTest : public MtransportTest { ASSERT_EQ_WAIT(s2, p2_->state(), 10000); } - void InitIce() { - p1_->InitIce(); - p2_->InitIce(); - } - void ConnectIce() { p1_->InitIce(); p2_->InitIce();