diff options
| author | sjl@chromium.org <sjl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 20:18:38 +0000 |
|---|---|---|
| committer | sjl@chromium.org <sjl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 20:18:38 +0000 |
| commit | dc2479d5909842e1e181a13751cc33887f285536 (patch) | |
| tree | bf4b95db6c967f199457941ff8d4e3bd31686e71 /media | |
| parent | a0d2f0e277a024c527ba1dc937e06a62ca90ad50 (diff) | |
| download | chromium_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 'media')
| -rw-r--r-- | media/filters/decoder_base_unittest.cc | 3 | ||||
| -rw-r--r-- | media/filters/ffmpeg_video_decoder_unittest.cc | 4 | ||||
| -rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/media/filters/decoder_base_unittest.cc b/media/filters/decoder_base_unittest.cc index 72e6e26..02ef1ec 100644 --- a/media/filters/decoder_base_unittest.cc +++ b/media/filters/decoder_base_unittest.cc @@ -13,6 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" using ::testing::_; +using ::testing::AnyNumber; using ::testing::NotNull; using ::testing::StrictMock; using ::testing::WithArg; @@ -125,6 +126,8 @@ TEST(DecoderBaseTest, FlowControl) { NewCallback(&read_callback, &MockDecoderCallback::OnReadComplete)); scoped_refptr<MockDemuxerStream> demuxer_stream(new MockDemuxerStream()); MockStatisticsCallback stats_callback_object; + EXPECT_CALL(stats_callback_object, OnStatistics(_)) + .Times(AnyNumber()); // Initialize. EXPECT_CALL(*decoder, DoInitialize(NotNull(), NotNull(), NotNull())) diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index 95acdc4..3b91d12 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc @@ -22,6 +22,7 @@ #include "testing/gtest/include/gtest/gtest.h" using ::testing::_; +using ::testing::AnyNumber; using ::testing::DoAll; using ::testing::Message; using ::testing::Return; @@ -156,6 +157,9 @@ class FFmpegVideoDecoderTest : public testing::Test { stream_.r_frame_rate.den = 1; buffer_ = new DataBuffer(1); end_of_stream_buffer_ = new DataBuffer(0); + + EXPECT_CALL(stats_callback_object_, OnStatistics(_)) + .Times(AnyNumber()); } virtual ~FFmpegVideoDecoderTest() { diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 5bef6ea..aa5cad1 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -68,6 +68,8 @@ class VideoRendererBaseTest : public ::testing::Test { decoder_media_format_.SetAsInteger(MediaFormat::kHeight, kHeight); EXPECT_CALL(*decoder_, media_format()) .WillRepeatedly(ReturnRef(decoder_media_format_)); + EXPECT_CALL(stats_callback_object_, OnStatistics(_)) + .Times(AnyNumber()); } virtual ~VideoRendererBaseTest() { |