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
diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc
index a159096..11b89aa 100644
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -2216,7 +2216,9 @@
talk_base::scoped_refptr<StatsObserverWrapper> observer(
new talk_base::RefCountedObject<StatsObserverWrapper>(jni, j_observer));
return ExtractNativePC(jni, j_pc)->GetStats(
- observer, reinterpret_cast<MediaStreamTrackInterface*>(native_track));
+ observer,
+ reinterpret_cast<MediaStreamTrackInterface*>(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 af33d02..502451a 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -448,11 +448,6 @@
}
bool PeerConnection::GetStats(StatsObserver* observer,
- webrtc::MediaStreamTrackInterface* track) {
- return GetStats(observer, track, kStatsOutputLevelStandard);
-}
-
-bool PeerConnection::GetStats(StatsObserver* observer,
MediaStreamTrackInterface* track,
StatsOutputLevel level) {
if (!VERIFY(observer != NULL)) {
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
index b4c45c3..cd5e2a9 100644
--- a/talk/app/webrtc/peerconnection.h
+++ b/talk/app/webrtc/peerconnection.h
@@ -75,8 +75,6 @@
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 c3f71f1..19aedb6 100644
--- a/talk/app/webrtc/peerconnection_unittest.cc
+++ b/talk/app/webrtc/peerconnection_unittest.cc
@@ -79,6 +79,7 @@
using webrtc::MockDataChannelObserver;
using webrtc::MockSetSessionDescriptionObserver;
using webrtc::MockStatsObserver;
+using webrtc::PeerConnectionInterface;
using webrtc::SessionDescriptionInterface;
using webrtc::StreamCollectionInterface;
@@ -328,7 +329,8 @@
int GetAudioOutputLevelStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
- 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 @@
int GetAudioInputLevelStats() {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
- 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 @@
int GetBytesReceivedStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
- 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 @@
int GetBytesSentStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
- 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 2f44885..cda98fd 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -199,10 +199,6 @@
virtual talk_base::scoped_refptr<DtmfSenderInterface> 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 98e0645..97a4176 100644
--- a/talk/app/webrtc/peerconnectioninterface_unittest.cc
+++ b/talk/app/webrtc/peerconnectioninterface_unittest.cc
@@ -410,7 +410,8 @@
bool DoGetStats(MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver> observer(
new talk_base::RefCountedObject<MockStatsObserver>());
- 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 57bee51..a571105 100644
--- a/talk/app/webrtc/peerconnectionproxy.h
+++ b/talk/app/webrtc/peerconnectionproxy.h
@@ -44,7 +44,6 @@
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
PROXY_METHOD1(talk_base::scoped_refptr<DtmfSenderInterface>,
CreateDtmfSender, AudioTrackInterface*)
- PROXY_METHOD2(bool, GetStats, StatsObserver*, MediaStreamTrackInterface*)
PROXY_METHOD3(bool, GetStats, StatsObserver*,
MediaStreamTrackInterface*,
StatsOutputLevel)