summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authorsjl@chromium.org <sjl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 20:18:38 +0000
committersjl@chromium.org <sjl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 20:18:38 +0000
commitdc2479d5909842e1e181a13751cc33887f285536 (patch)
treebf4b95db6c967f199457941ff8d4e3bd31686e71 /webkit/glue/webmediaplayer_impl.cc
parenta0d2f0e277a024c527ba1dc937e06a62ca90ad50 (diff)
downloadchromium_src-dc2479d5909842e1e181a13751cc33887f285536.zip
chromium_src-dc2479d5909842e1e181a13751cc33887f285536.tar.gz
chromium_src-dc2479d5909842e1e181a13751cc33887f285536.tar.bz2
Rename media statistics APIs to match webkit renaming.
Also, set expectations for statistics callback mock in unittests the lack of which caused "uninteresting calls" turds in the mock output. This mock was introduced in the original patch for media statistics (http://codereview.chromium.org/6246091/). BUG=71255, 73464 TEST=media_unittests Review URL: http://codereview.chromium.org/6549030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 8e13944..eda79f5 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -671,7 +671,7 @@ WebKit::WebMediaPlayer::MovieLoadType
return WebKit::WebMediaPlayer::Unknown;
}
-unsigned long WebMediaPlayerImpl::decodedFrames() const
+unsigned WebMediaPlayerImpl::decodedFrameCount() const
{
DCHECK(MessageLoop::current() == main_loop_);
@@ -679,7 +679,7 @@ unsigned long WebMediaPlayerImpl::decodedFrames() const
return stats.video_frames_decoded;
}
-unsigned long WebMediaPlayerImpl::droppedFrames() const
+unsigned WebMediaPlayerImpl::droppedFrameCount() const
{
DCHECK(MessageLoop::current() == main_loop_);
@@ -687,7 +687,7 @@ unsigned long WebMediaPlayerImpl::droppedFrames() const
return stats.video_frames_dropped;
}
-unsigned long WebMediaPlayerImpl::audioBytesDecoded() const
+unsigned WebMediaPlayerImpl::audioDecodedByteCount() const
{
DCHECK(MessageLoop::current() == main_loop_);
@@ -695,7 +695,7 @@ unsigned long WebMediaPlayerImpl::audioBytesDecoded() const
return stats.audio_bytes_decoded;
}
-unsigned long WebMediaPlayerImpl::videoBytesDecoded() const
+unsigned WebMediaPlayerImpl::videoDecodedByteCount() const
{
DCHECK(MessageLoop::current() == main_loop_);