From db41b4dbcdeb9a3b71b8de274db8654f3e51c99c Mon Sep 17 00:00:00 2001 From: "jiayl@webrtc.org" Date: Mon, 3 Mar 2014 21:30:06 +0000 Subject: [PATCH] Remove the deprecated GetStats method from PeerConnectionInterface. R=fischman@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/8879004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5634 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/java/jni/peerconnection_jni.cc | 4 +++- talk/app/webrtc/peerconnection.cc | 5 ----- talk/app/webrtc/peerconnection.h | 2 -- talk/app/webrtc/peerconnection_unittest.cc | 13 +++++++++---- talk/app/webrtc/peerconnectioninterface.h | 4 ---- talk/app/webrtc/peerconnectioninterface_unittest.cc | 3 ++- talk/app/webrtc/peerconnectionproxy.h | 1 - 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index a1590966b5..11b89aaffb 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -2216,7 +2216,9 @@ JOW(bool, PeerConnection_nativeGetStats)( talk_base::scoped_refptr observer( new talk_base::RefCountedObject(jni, j_observer)); return ExtractNativePC(jni, j_pc)->GetStats( - observer, reinterpret_cast(native_track)); + observer, + reinterpret_cast(native_track), + PeerConnectionInterface::kStatsOutputLevelStandard); } JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) { diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index af33d02dd8..502451a176 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -447,11 +447,6 @@ talk_base::scoped_refptr PeerConnection::CreateDtmfSender( return DtmfSenderProxy::Create(signaling_thread(), sender.get()); } -bool PeerConnection::GetStats(StatsObserver* observer, - webrtc::MediaStreamTrackInterface* track) { - return GetStats(observer, track, kStatsOutputLevelStandard); -} - bool PeerConnection::GetStats(StatsObserver* observer, MediaStreamTrackInterface* track, StatsOutputLevel level) { diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h index b4c45c316f..cd5e2a9bc2 100644 --- a/talk/app/webrtc/peerconnection.h +++ b/talk/app/webrtc/peerconnection.h @@ -74,8 +74,6 @@ class PeerConnection : public PeerConnectionInterface, virtual talk_base::scoped_refptr CreateDataChannel( const std::string& label, const DataChannelInit* config); - virtual bool GetStats(StatsObserver* observer, - webrtc::MediaStreamTrackInterface* track); virtual bool GetStats(StatsObserver* observer, webrtc::MediaStreamTrackInterface* track, StatsOutputLevel level); diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index c3f71f1eef..19aedb6700 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -79,6 +79,7 @@ using webrtc::MockCreateSessionDescriptionObserver; using webrtc::MockDataChannelObserver; using webrtc::MockSetSessionDescriptionObserver; using webrtc::MockStatsObserver; +using webrtc::PeerConnectionInterface; using webrtc::SessionDescriptionInterface; using webrtc::StreamCollectionInterface; @@ -328,7 +329,8 @@ class PeerConnectionTestClientBase int GetAudioOutputLevelStats(webrtc::MediaStreamTrackInterface* track) { talk_base::scoped_refptr observer(new talk_base::RefCountedObject()); - EXPECT_TRUE(peer_connection_->GetStats(observer, track)); + EXPECT_TRUE(peer_connection_->GetStats( + observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); return observer->AudioOutputLevel(); } @@ -336,7 +338,8 @@ class PeerConnectionTestClientBase int GetAudioInputLevelStats() { talk_base::scoped_refptr observer(new talk_base::RefCountedObject()); - EXPECT_TRUE(peer_connection_->GetStats(observer, NULL)); + EXPECT_TRUE(peer_connection_->GetStats( + observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard)); EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); return observer->AudioInputLevel(); } @@ -344,7 +347,8 @@ class PeerConnectionTestClientBase int GetBytesReceivedStats(webrtc::MediaStreamTrackInterface* track) { talk_base::scoped_refptr observer(new talk_base::RefCountedObject()); - EXPECT_TRUE(peer_connection_->GetStats(observer, track)); + EXPECT_TRUE(peer_connection_->GetStats( + observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); return observer->BytesReceived(); } @@ -352,7 +356,8 @@ class PeerConnectionTestClientBase int GetBytesSentStats(webrtc::MediaStreamTrackInterface* track) { talk_base::scoped_refptr observer(new talk_base::RefCountedObject()); - EXPECT_TRUE(peer_connection_->GetStats(observer, track)); + EXPECT_TRUE(peer_connection_->GetStats( + observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); return observer->BytesSent(); } diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h index 2f44885c88..cda98fdd9d 100644 --- a/talk/app/webrtc/peerconnectioninterface.h +++ b/talk/app/webrtc/peerconnectioninterface.h @@ -199,10 +199,6 @@ class PeerConnectionInterface : public talk_base::RefCountInterface { virtual talk_base::scoped_refptr CreateDtmfSender( AudioTrackInterface* track) = 0; - // TODO(jiayl): remove the old API once all Chrome overrides are updated. - virtual bool GetStats(StatsObserver* observer, - MediaStreamTrackInterface* track) = 0; - virtual bool GetStats(StatsObserver* observer, MediaStreamTrackInterface* track, StatsOutputLevel level) = 0; diff --git a/talk/app/webrtc/peerconnectioninterface_unittest.cc b/talk/app/webrtc/peerconnectioninterface_unittest.cc index 98e0645839..97a4176df1 100644 --- a/talk/app/webrtc/peerconnectioninterface_unittest.cc +++ b/talk/app/webrtc/peerconnectioninterface_unittest.cc @@ -410,7 +410,8 @@ class PeerConnectionInterfaceTest : public testing::Test { bool DoGetStats(MediaStreamTrackInterface* track) { talk_base::scoped_refptr observer( new talk_base::RefCountedObject()); - if (!pc_->GetStats(observer, track)) + if (!pc_->GetStats( + observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)) return false; EXPECT_TRUE_WAIT(observer->called(), kTimeout); return observer->called(); diff --git a/talk/app/webrtc/peerconnectionproxy.h b/talk/app/webrtc/peerconnectionproxy.h index 57bee518c4..a571105844 100644 --- a/talk/app/webrtc/peerconnectionproxy.h +++ b/talk/app/webrtc/peerconnectionproxy.h @@ -44,7 +44,6 @@ BEGIN_PROXY_MAP(PeerConnection) PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*) PROXY_METHOD1(talk_base::scoped_refptr, CreateDtmfSender, AudioTrackInterface*) - PROXY_METHOD2(bool, GetStats, StatsObserver*, MediaStreamTrackInterface*) PROXY_METHOD3(bool, GetStats, StatsObserver*, MediaStreamTrackInterface*, StatsOutputLevel)