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

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: Update other implementations of DataSourceHost and DemuxerHost. 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
Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 6e5180222c718c68c8dab7dd8a30d4eacac33885..313da70c9dee5a4cd41d032b26d0a5faea407c78 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,12 @@ class PipelineTest : public ::testing::Test {
EXPECT_CALL(callbacks_, OnPrerollCompleted());
}
+ // This is required to test the time range code now that DemuxerHost does
scherkus (not reviewing) 2014/03/28 20:54:09 nit: tell it like it and stick a big ol' "HACK: "
sandersd (OOO until July 31) 2014/03/28 21:14:28 Done.
+ // not include SetTotalBytes(). This will be removed when the DataSourceHost
+ // implementation is moved out of Pipeline.
+ DataSourceHost* host = pipeline_.get();
+ host->SetTotalBytes(kTotalBytes);
+
pipeline_->Start(
filter_collection_.Pass(),
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),

Powered by Google App Engine
This is Rietveld 408576698