Index: media/test/pipeline_integration_test_base.cc |
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc |
index 7592ed81b3f6f7947cbe13ff4ed19c9c52be46de..ca9dee95320122827d5ee0864ee8f59c6d754de3 100644 |
--- a/media/test/pipeline_integration_test_base.cc |
+++ b/media/test/pipeline_integration_test_base.cc |
@@ -64,7 +64,7 @@ void PipelineIntegrationTestBase::OnSeeked(base::TimeDelta seek_time, |
void PipelineIntegrationTestBase::OnStatusCallback( |
PipelineStatus status) { |
pipeline_status_ = status; |
- message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); |
+ message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
} |
void PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB( |
@@ -79,7 +79,7 @@ void PipelineIntegrationTestBase::OnEnded() { |
DCHECK(!ended_); |
ended_ = true; |
pipeline_status_ = PIPELINE_OK; |
- message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); |
+ message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
} |
bool PipelineIntegrationTestBase::WaitUntilOnEnded() { |
@@ -100,7 +100,7 @@ PipelineStatus PipelineIntegrationTestBase::WaitUntilEndedOrError() { |
void PipelineIntegrationTestBase::OnError(PipelineStatus status) { |
DCHECK_NE(status, PIPELINE_OK); |
pipeline_status_ = status; |
- message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); |
+ message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
} |
PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename) { |
@@ -175,7 +175,7 @@ bool PipelineIntegrationTestBase::Seek(base::TimeDelta seek_time) { |
void PipelineIntegrationTestBase::Stop() { |
DCHECK(pipeline_->IsRunning()); |
- pipeline_->Stop(base::MessageLoop::QuitClosure()); |
+ pipeline_->Stop(base::MessageLoop::QuitWhenIdleClosure()); |
message_loop_.Run(); |
} |
@@ -183,7 +183,7 @@ void PipelineIntegrationTestBase::QuitAfterCurrentTimeTask( |
const base::TimeDelta& quit_time) { |
if (pipeline_->GetMediaTime() >= quit_time || |
pipeline_status_ != PIPELINE_OK) { |
- message_loop_.Quit(); |
+ message_loop_.QuitWhenIdle(); |
return; |
} |