diff options
author | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 02:33:53 +0000 |
---|---|---|
committer | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 02:33:53 +0000 |
commit | ee828d831e93b58b3a79e7dfc27ab8795f7b5fcc (patch) | |
tree | 4ea7996ed92fd93488c9a569a0c77cfda276e6de /content | |
parent | 496e2013094c2b4feee81c5381f305531afc6bde (diff) | |
download | chromium_src-ee828d831e93b58b3a79e7dfc27ab8795f7b5fcc.zip chromium_src-ee828d831e93b58b3a79e7dfc27ab8795f7b5fcc.tar.gz chromium_src-ee828d831e93b58b3a79e7dfc27ab8795f7b5fcc.tar.bz2 |
Remove "OVERRIDE" from the deprecated MockPeerConnectionImpl::GetStats
so that the method can be removed from the interface from third_party/libjingle.
Review URL: https://codereview.chromium.org/171663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/renderer/media/mock_peer_connection_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/media/mock_peer_connection_impl.h | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index b944bd1..4dc55f3 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -263,10 +263,12 @@ MockPeerConnectionImpl::CreateDataChannel(const std::string& label, bool MockPeerConnectionImpl::GetStats( webrtc::StatsObserver* observer, - webrtc::MediaStreamTrackInterface* track) { + webrtc::MediaStreamTrackInterface* track, + StatsOutputLevel level) { if (!getstats_result_) return false; + DCHECK_EQ(kStatsOutputLevelStandard, level); std::vector<webrtc::StatsReport> reports; webrtc::StatsReport report; report.id = "1234"; diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index 5da1523..20bf9af 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h @@ -39,12 +39,13 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface { const webrtc::DataChannelInit* config) OVERRIDE; virtual bool GetStats(webrtc::StatsObserver* observer, - webrtc::MediaStreamTrackInterface* track) OVERRIDE; + webrtc::MediaStreamTrackInterface* track) { + return false; + } virtual bool GetStats(webrtc::StatsObserver* observer, webrtc::MediaStreamTrackInterface* track, - StatsOutputLevel level) OVERRIDE { - return GetStats(observer, track); - } + StatsOutputLevel level) OVERRIDE; + // Set Call this function to make sure next call to GetStats fail. void SetGetStatsResult(bool result) { getstats_result_ = result; } |