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

Unified Diff: media/base/pipeline_unittest.cc

Issue 10800041: Update media duration if data is appended after the previous duration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ChunkDemuxer tests Created 8 years, 5 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 1ff12c23d8b6e136059add328593151ab85bbbfb..4b5b17fdfb82ee87a9e19a42fab875e2cbd0874f 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -62,6 +62,7 @@ class CallbackHelper {
MOCK_METHOD0(OnStop, void());
MOCK_METHOD1(OnEnded, void(PipelineStatus));
MOCK_METHOD1(OnError, void(PipelineStatus));
+ MOCK_METHOD0(OnNewDuration, void());
private:
DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
@@ -221,12 +222,16 @@ class PipelineTest : public ::testing::Test {
// after tests have set expectations any filters they wish to use.
void InitializePipeline(PipelineStatus start_status) {
EXPECT_CALL(callbacks_, OnStart(start_status));
+ if (start_status == PIPELINE_OK)
+ EXPECT_CALL(callbacks_, OnNewDuration());
pipeline_->Start(
mocks_->Create().Pass(),
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)));
+ base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnNewDuration,
+ base::Unretained(&callbacks_)));
message_loop_.RunAllPending();
}
@@ -351,7 +356,9 @@ TEST_F(PipelineTest, NeverInitializes) {
mocks_->Create().Pass(),
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)));
+ base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnNewDuration,
+ base::Unretained(&callbacks_)));
message_loop_.RunAllPending();
EXPECT_FALSE(pipeline_->IsInitialized());
@@ -373,7 +380,9 @@ TEST_F(PipelineTest, RequiredFilterMissing) {
collection.Pass(),
base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
- base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)));
+ base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
+ base::Bind(&CallbackHelper::OnNewDuration,
+ base::Unretained(&callbacks_)));
message_loop_.RunAllPending();
EXPECT_FALSE(pipeline_->IsInitialized());
}

Powered by Google App Engine
This is Rietveld 408576698