diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 06:55:18 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 06:55:18 +0000 |
| commit | c8f7b9c1535e9234450bf8aaf643ff10b4a3364c (patch) | |
| tree | 8b5accbb12a1e67f7a287142479b02e872b5dac3 /media | |
| parent | bce75a79e1c2a0a9e543b7190e601e94c5f52dc3 (diff) | |
| download | chromium_src-c8f7b9c1535e9234450bf8aaf643ff10b4a3364c.zip chromium_src-c8f7b9c1535e9234450bf8aaf643ff10b4a3364c.tar.gz chromium_src-c8f7b9c1535e9234450bf8aaf643ff10b4a3364c.tar.bz2 | |
Fix Valgrind warnings from r105646.
TBR=scherkus@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8304020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_demuxer_unittest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index dcf5743..231314d 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -36,6 +36,10 @@ MATCHER(IsEndOfStreamBuffer, return arg->IsEndOfStream(); } +ACTION(DeleteArg0Buffer) { + scoped_refptr<Buffer> buffer(arg0); +} + // Fixture class to facilitate writing tests. Takes care of setting up the // FFmpeg, pipeline and filter host mocks. class FFmpegDemuxerTest : public testing::Test { @@ -403,7 +407,8 @@ TEST_F(FFmpegDemuxerTest, Stop) { // The callback should be immediately deleted. We'll use a checkpoint to // verify that it has indeed been deleted. - EXPECT_CALL(*callback, Run(NotNull())); + EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer())) + .WillOnce(DeleteArg0Buffer()); EXPECT_CALL(*callback, OnDelete()); EXPECT_CALL(*this, CheckPoint(1)); @@ -442,7 +447,8 @@ TEST_F(FFmpegDemuxerTest, StreamReadAfterStopAndDemuxerDestruction) { // The callback should be immediately deleted. We'll use a checkpoint to // verify that it has indeed been deleted. - EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer())); + EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer())) + .WillOnce(DeleteArg0Buffer()); EXPECT_CALL(*callback, OnDelete()); EXPECT_CALL(*this, CheckPoint(1)); |