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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 7484054: Migrate Pipeline & PipelineImpl to PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CR nits Created 9 years, 4 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_factory.cc ('k') | media/tools/player_wtl/movie.cc » ('j') | 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 8d4f284b464870f10c11214db47a41b485a98342..1113e9b3a920f495fcf6cc7142127163aafc68d2 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -147,7 +147,7 @@ class FFmpegDemuxerTest : public testing::Test {
EXPECT_CALL(host_, SetDuration(expected_duration));
demuxer_->Initialize(data_source_.get(),
- NewExpectedStatusCallback(PIPELINE_OK));
+ NewExpectedStatusCB(PIPELINE_OK));
message_loop_.RunAllPending();
}
@@ -187,7 +187,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_OpenFails) {
.WillOnce(Return(-1));
demuxer_->Initialize(data_source_.get(),
- NewExpectedStatusCallback(DEMUXER_ERROR_COULD_NOT_OPEN));
+ NewExpectedStatusCB(DEMUXER_ERROR_COULD_NOT_OPEN));
message_loop_.RunAllPending();
}
@@ -201,7 +201,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_ParseFails) {
demuxer_->Initialize(
data_source_.get(),
- NewExpectedStatusCallback(DEMUXER_ERROR_COULD_NOT_PARSE));
+ NewExpectedStatusCB(DEMUXER_ERROR_COULD_NOT_PARSE));
message_loop_.RunAllPending();
}
@@ -215,7 +215,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_NoStreams) {
demuxer_->Initialize(
data_source_.get(),
- NewExpectedStatusCallback(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
+ NewExpectedStatusCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
message_loop_.RunAllPending();
}
@@ -230,7 +230,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_DataStreamOnly) {
demuxer_->Initialize(
data_source_.get(),
- NewExpectedStatusCallback(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
+ NewExpectedStatusCB(DEMUXER_ERROR_NO_SUPPORTED_STREAMS));
message_loop_.RunAllPending();
}
« no previous file with comments | « media/filters/ffmpeg_demuxer_factory.cc ('k') | media/tools/player_wtl/movie.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698