From dfb769d848e08ad4b15e94da502bbc2d99072d1d Mon Sep 17 00:00:00 2001 From: perkj Date: Tue, 9 Feb 2016 03:09:43 -0800 Subject: [PATCH] Remove deprecated PeerConnectionObserver::OnStateChange and OnIceComplete These methods are no longer used. OnStateChange needs to be removed from Chrome before this cl lands. https://codereview.chromium.org/1668413003/ TBR=glaznev@webrtc.org for webrtc/examples Review URL: https://codereview.webrtc.org/1669993003 Cr-Commit-Position: refs/heads/master@{#11537} --- talk/app/webrtc/peerconnection.cc | 6 ---- talk/app/webrtc/peerconnection.h | 1 - talk/app/webrtc/peerconnection_unittest.cc | 2 -- talk/app/webrtc/peerconnectioninterface.h | 14 ++------- .../peerconnectioninterface_unittest.cc | 30 ++++++------------ talk/app/webrtc/webrtcsession.cc | 1 - talk/app/webrtc/webrtcsession.h | 4 --- talk/app/webrtc/webrtcsession_unittest.cc | 31 +++++-------------- .../peerconnection/client/conductor.h | 21 ++++++++----- 9 files changed, 33 insertions(+), 77 deletions(-) diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index c375e29215..c423b0fade 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -1390,11 +1390,6 @@ void PeerConnection::OnIceCandidate(const IceCandidateInterface* candidate) { observer_->OnIceCandidate(candidate); } -void PeerConnection::OnIceComplete() { - RTC_DCHECK(signaling_thread()->IsCurrent()); - observer_->OnIceComplete(); -} - void PeerConnection::OnIceConnectionReceivingChange(bool receiving) { RTC_DCHECK(signaling_thread()->IsCurrent()); observer_->OnIceConnectionReceivingChange(receiving); @@ -1412,7 +1407,6 @@ void PeerConnection::ChangeSignalingState( } } observer_->OnSignalingChange(signaling_state_); - observer_->OnStateChange(PeerConnectionObserver::kSignalingState); } void PeerConnection::OnAudioTrackAdded(AudioTrackInterface* track, diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h index 03b5853c29..dce24fd293 100644 --- a/talk/app/webrtc/peerconnection.h +++ b/talk/app/webrtc/peerconnection.h @@ -187,7 +187,6 @@ class PeerConnection : public PeerConnectionInterface, void OnIceConnectionChange(IceConnectionState new_state) override; void OnIceGatheringChange(IceGatheringState new_state) override; void OnIceCandidate(const IceCandidateInterface* candidate) override; - void OnIceComplete() override; void OnIceConnectionReceivingChange(bool receiving) override; // Signals from WebRtcSession. diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index 90615918e5..cad13e2441 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -386,8 +386,6 @@ class PeerConnectionTestClient : public webrtc::PeerConnectionObserver, return true; } - void OnIceComplete() override { LOG(INFO) << id_ << "OnIceComplete"; } - void OnDataChannel(DataChannelInterface* data_channel) override { LOG(INFO) << id_ << "OnDataChannel"; data_channel_ = data_channel; diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h index 9c0cefaca6..940f0fb9e6 100644 --- a/talk/app/webrtc/peerconnectioninterface.h +++ b/talk/app/webrtc/peerconnectioninterface.h @@ -465,11 +465,7 @@ class PeerConnectionObserver { // Triggered when the SignalingState changed. virtual void OnSignalingChange( - PeerConnectionInterface::SignalingState new_state) {} - - // Triggered when SignalingState or IceState have changed. - // TODO(bemasc): Remove once callers transition to OnSignalingChange. - virtual void OnStateChange(StateType state_changed) {} + PeerConnectionInterface::SignalingState new_state) = 0; // Triggered when media is received on a new stream from remote peer. virtual void OnAddStream(MediaStreamInterface* stream) = 0; @@ -485,19 +481,15 @@ class PeerConnectionObserver { // Called any time the IceConnectionState changes virtual void OnIceConnectionChange( - PeerConnectionInterface::IceConnectionState new_state) {} + PeerConnectionInterface::IceConnectionState new_state) = 0; // Called any time the IceGatheringState changes virtual void OnIceGatheringChange( - PeerConnectionInterface::IceGatheringState new_state) {} + PeerConnectionInterface::IceGatheringState new_state) = 0; // New Ice candidate have been found. virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0; - // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange. - // All Ice candidates have been found. - virtual void OnIceComplete() {} - // Called when the ICE connection receiving status changes. virtual void OnIceConnectionReceivingChange(bool receiving) {} diff --git a/talk/app/webrtc/peerconnectioninterface_unittest.cc b/talk/app/webrtc/peerconnectioninterface_unittest.cc index 2388e71c04..c29718fe34 100644 --- a/talk/app/webrtc/peerconnectioninterface_unittest.cc +++ b/talk/app/webrtc/peerconnectioninterface_unittest.cc @@ -443,30 +443,29 @@ class MockPeerConnectionObserver : public PeerConnectionObserver { return remote_streams_->find(label); } StreamCollectionInterface* remote_streams() const { return remote_streams_; } - virtual void OnAddStream(MediaStreamInterface* stream) { + void OnAddStream(MediaStreamInterface* stream) override { last_added_stream_ = stream; remote_streams_->AddStream(stream); } - virtual void OnRemoveStream(MediaStreamInterface* stream) { + void OnRemoveStream(MediaStreamInterface* stream) override { last_removed_stream_ = stream; remote_streams_->RemoveStream(stream); } - virtual void OnRenegotiationNeeded() { - renegotiation_needed_ = true; - } - virtual void OnDataChannel(DataChannelInterface* data_channel) { + void OnRenegotiationNeeded() override { renegotiation_needed_ = true; } + void OnDataChannel(DataChannelInterface* data_channel) override { last_datachannel_ = data_channel; } - virtual void OnIceConnectionChange( - PeerConnectionInterface::IceConnectionState new_state) { + void OnIceConnectionChange( + PeerConnectionInterface::IceConnectionState new_state) override { EXPECT_EQ(pc_->ice_connection_state(), new_state); } - virtual void OnIceGatheringChange( - PeerConnectionInterface::IceGatheringState new_state) { + void OnIceGatheringChange( + PeerConnectionInterface::IceGatheringState new_state) override { EXPECT_EQ(pc_->ice_gathering_state(), new_state); + ice_complete_ = new_state == PeerConnectionInterface::kIceGatheringComplete; } - virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) { + void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override { EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, pc_->ice_gathering_state()); @@ -477,15 +476,6 @@ class MockPeerConnectionObserver : public PeerConnectionObserver { candidate->sdp_mline_index(), sdp, NULL)); EXPECT_TRUE(last_candidate_.get() != NULL); } - // TODO(bemasc): Remove this once callers transition to OnSignalingChange. - virtual void OnIceComplete() { - ice_complete_ = true; - // OnIceGatheringChange(IceGatheringCompleted) and OnIceComplete() should - // be called approximately simultaneously. For ease of testing, this - // check additionally requires that they be called in the above order. - EXPECT_EQ(PeerConnectionInterface::kIceGatheringComplete, - pc_->ice_gathering_state()); - } // Returns the label of the last added stream. // Empty string if no stream have been added. diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc index 5957cae8ae..a848408ec5 100644 --- a/talk/app/webrtc/webrtcsession.cc +++ b/talk/app/webrtc/webrtcsession.cc @@ -2059,7 +2059,6 @@ void WebRtcSession::OnTransportControllerGatheringState( if (ice_observer_) { ice_observer_->OnIceGatheringChange( PeerConnectionInterface::kIceGatheringComplete); - ice_observer_->OnIceComplete(); } } } diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h index 9695de65d3..7378736b15 100644 --- a/talk/app/webrtc/webrtcsession.h +++ b/talk/app/webrtc/webrtcsession.h @@ -96,10 +96,6 @@ class IceObserver { PeerConnectionInterface::IceGatheringState new_state) {} // New Ice candidate have been found. virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0; - // All Ice candidates have been found. - // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange. - // (via PeerConnectionObserver) - virtual void OnIceComplete() {} // Called whenever the state changes between receiving and not receiving. virtual void OnIceConnectionReceivingChange(bool receiving) {} diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc index c553165f9b..8d8a782538 100644 --- a/talk/app/webrtc/webrtcsession_unittest.cc +++ b/talk/app/webrtc/webrtcsession_unittest.cc @@ -179,26 +179,21 @@ class MockIceObserver : public webrtc::IceObserver { ice_gathering_state_(PeerConnectionInterface::kIceGatheringNew) { } - virtual void OnIceConnectionChange( - PeerConnectionInterface::IceConnectionState new_state) { + void OnIceConnectionChange( + PeerConnectionInterface::IceConnectionState new_state) override { ice_connection_state_ = new_state; } - virtual void OnIceGatheringChange( - PeerConnectionInterface::IceGatheringState new_state) { + void OnIceGatheringChange( + PeerConnectionInterface::IceGatheringState new_state) override { // We can never transition back to "new". EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, new_state); ice_gathering_state_ = new_state; - - // oncandidatesready_ really means "ICE gathering is complete". - // This if statement ensures that this value remains correct when we - // transition from kIceGatheringComplete to kIceGatheringGathering. - if (new_state == PeerConnectionInterface::kIceGatheringGathering) { - oncandidatesready_ = false; - } + oncandidatesready_ = + new_state == PeerConnectionInterface::kIceGatheringComplete; } // Found a new candidate. - virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) { + void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override { switch (candidate->sdp_mline_index()) { case kMediaContentIndex0: mline_0_candidates_.push_back(candidate->candidate()); @@ -215,18 +210,6 @@ class MockIceObserver : public webrtc::IceObserver { EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, ice_gathering_state_); } - // TODO(bemasc): Remove this once callers transition to OnIceGatheringChange. - virtual void OnIceComplete() { - EXPECT_FALSE(oncandidatesready_); - oncandidatesready_ = true; - - // OnIceGatheringChange(IceGatheringCompleted) and OnIceComplete() should - // be called approximately simultaneously. For ease of testing, this - // check additionally requires that they be called in the above order. - EXPECT_EQ(PeerConnectionInterface::kIceGatheringComplete, - ice_gathering_state_); - } - bool oncandidatesready_; std::vector mline_0_candidates_; std::vector mline_1_candidates_; diff --git a/webrtc/examples/peerconnection/client/conductor.h b/webrtc/examples/peerconnection/client/conductor.h index e5ee170299..21d838aae4 100644 --- a/webrtc/examples/peerconnection/client/conductor.h +++ b/webrtc/examples/peerconnection/client/conductor.h @@ -64,14 +64,19 @@ class Conductor // // PeerConnectionObserver implementation. // - virtual void OnStateChange( - webrtc::PeerConnectionObserver::StateType state_changed) {} - virtual void OnAddStream(webrtc::MediaStreamInterface* stream); - virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream); - virtual void OnDataChannel(webrtc::DataChannelInterface* channel) {} - virtual void OnRenegotiationNeeded() {} - virtual void OnIceChange() {} - virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate); + + void OnSignalingChange( + webrtc::PeerConnectionInterface::SignalingState new_state) override{}; + void OnAddStream(webrtc::MediaStreamInterface* stream) override; + void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; + void OnDataChannel(webrtc::DataChannelInterface* channel) override {} + void OnRenegotiationNeeded() override {} + void OnIceConnectionChange( + webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; + void OnIceGatheringChange( + webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; + void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; + void OnIceConnectionReceivingChange(bool receiving) override {} // // PeerConnectionClientObserver implementation.