Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 8319010: Properly ref-count the EndOfStream buffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep one change in r105647. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 231314de8c5edba4832447229b673008a0756353..24fcdc36ba50d02077005edc37ab442623918023 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -36,10 +36,6 @@ 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 {
@@ -407,8 +403,7 @@ 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(IsEndOfStreamBuffer()))
- .WillOnce(DeleteArg0Buffer());
+ EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()));
EXPECT_CALL(*callback, OnDelete());
EXPECT_CALL(*this, CheckPoint(1));
@@ -447,8 +442,7 @@ 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()))
- .WillOnce(DeleteArg0Buffer());
+ EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()));
EXPECT_CALL(*callback, OnDelete());
EXPECT_CALL(*this, CheckPoint(1));
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698