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

Unified Diff: media/filters/pipeline_integration_test.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: . 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/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 89b1a234f48ecdcdb5fb5ece9ec2c5efbd078267..a5addff4dd629af459fa9e098ef7cd57146a7b3e 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -186,11 +186,13 @@ class PipelineIntegrationTest
public PipelineIntegrationTestBase {
public:
void StartPipelineWithMediaSource(MockMediaSource* source) {
+ base::Closure null_cb;
pipeline_->Start(
CreateFilterCollection(source),
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
- QuitOnStatusCB(PIPELINE_OK));
+ QuitOnStatusCB(PIPELINE_OK),
+ null_cb);
ASSERT_TRUE(decoder_.get());
@@ -200,11 +202,13 @@ class PipelineIntegrationTest
void StartPipelineWithEncryptedMedia(
MockMediaSource* source,
FakeDecryptorClient* encrypted_media) {
+ base::Closure null_cb;
pipeline_->Start(
CreateFilterCollection(source),
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
- QuitOnStatusCB(PIPELINE_OK));
+ QuitOnStatusCB(PIPELINE_OK),
+ null_cb);
ASSERT_TRUE(decoder_.get());
decoder_->set_decryptor(encrypted_media->decryptor());

Powered by Google App Engine
This is Rietveld 408576698