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

Unified Diff: media/base/pipeline_unittest.cc

Issue 212803004: Separate DemuxerHost from DataSourceHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 9 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/base/pipeline.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 6e5180222c718c68c8dab7dd8a30d4eacac33885..9fd07f22e1c44e77d2446a0b4b9f3999c3977fea 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -38,11 +38,9 @@ using ::testing::WithArg;
namespace media {
-// Demuxer properties.
const int kTotalBytes = 1024;
ACTION_P(SetDemuxerProperties, duration) {
- arg0->SetTotalBytes(kTotalBytes);
arg0->SetDuration(duration);
}
@@ -219,6 +217,13 @@ class PipelineTest : public ::testing::Test {
EXPECT_CALL(callbacks_, OnPrerollCompleted());
}
+ // HACK: This is required to test the time range code now that DemuxerHost
+ // does not include SetTotalBytes(). The test cases that depend on this will
+ // be moved out of pipeline_unittest when Pipeline stops implementing
+ // DataSourceHost, see http://crbug.com/122071.
+ DataSourceHost* host = pipeline_.get();
+ host->SetTotalBytes(kTotalBytes);
+
pipeline_->Start(
filter_collection_.Pass(),
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698