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

Unified Diff: media/filters/pipeline_integration_test_base.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_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 823104b6db3e9609231734c46e2f1bf11d45a995..dfd8474182213d10e60394214f82fcbfc033dd99 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -87,11 +87,13 @@ void PipelineIntegrationTestBase::OnError(PipelineStatus status) {
bool PipelineIntegrationTestBase::Start(const std::string& url,
PipelineStatus expected_status) {
+ base::Closure null_cb;
pipeline_->Start(
CreateFilterCollection(url),
base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)),
- QuitOnStatusCB(expected_status));
+ QuitOnStatusCB(expected_status),
+ null_cb);
message_loop_.Run();
return (pipeline_status_ == PIPELINE_OK);
}
@@ -104,12 +106,14 @@ bool PipelineIntegrationTestBase::Start(const std::string& url,
}
bool PipelineIntegrationTestBase::Start(const std::string& url) {
+ base::Closure null_cb;
pipeline_->Start(
CreateFilterCollection(url),
base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)),
base::Bind(&PipelineIntegrationTestBase::OnStatusCallback,
- base::Unretained(this)));
+ base::Unretained(this)),
+ null_cb);
message_loop_.Run();
return (pipeline_status_ == PIPELINE_OK);
}

Powered by Google App Engine
This is Rietveld 408576698