| 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 76152eda8783133c202bc85e00fd436ebc1cea09..df35d64a23ef82f6a680f4ca24045fad95bee9c8 100644
|
| --- a/media/filters/pipeline_integration_test_base.cc
|
| +++ b/media/filters/pipeline_integration_test_base.cc
|
| @@ -88,11 +88,15 @@ void PipelineIntegrationTestBase::OnError(PipelineStatus status) {
|
|
|
| bool PipelineIntegrationTestBase::Start(const std::string& url,
|
| PipelineStatus expected_status) {
|
| + EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveMetadata));
|
| + EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveEnoughData));
|
| pipeline_->Start(
|
| CreateFilterCollection(url),
|
| base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
|
| base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)),
|
| - QuitOnStatusCB(expected_status));
|
| + QuitOnStatusCB(expected_status),
|
| + base::Bind(&PipelineIntegrationTestBase::OnReadyState,
|
| + base::Unretained(this)));
|
| message_loop_.Run();
|
| return (pipeline_status_ == PIPELINE_OK);
|
| }
|
| @@ -105,11 +109,15 @@ bool PipelineIntegrationTestBase::Start(const std::string& url,
|
| }
|
|
|
| bool PipelineIntegrationTestBase::Start(const std::string& url) {
|
| + EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveMetadata));
|
| + EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveEnoughData));
|
| 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::Bind(&PipelineIntegrationTestBase::OnReadyState,
|
| base::Unretained(this)));
|
| message_loop_.Run();
|
| return (pipeline_status_ == PIPELINE_OK);
|
| @@ -126,6 +134,7 @@ void PipelineIntegrationTestBase::Pause() {
|
| bool PipelineIntegrationTestBase::Seek(base::TimeDelta seek_time) {
|
| ended_ = false;
|
|
|
| + EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveEnoughData));
|
| pipeline_->Seek(seek_time, QuitOnStatusCB(PIPELINE_OK));
|
| message_loop_.Run();
|
| return (pipeline_status_ == PIPELINE_OK);
|
|
|