Index: media/filters/pipeline_integration_test.cc |
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc |
index aa53b1baf93da2d58239fc2aad51132e4d39a957..f83c14d1df71416846747337d1f00ebc929b3c7f 100644 |
--- a/media/filters/pipeline_integration_test.cc |
+++ b/media/filters/pipeline_integration_test.cc |
@@ -184,11 +184,15 @@ class PipelineIntegrationTest |
public PipelineIntegrationTestBase { |
public: |
void StartPipelineWithMediaSource(MockMediaSource* source) { |
+ EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveMetadata)); |
+ EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveEnoughData)); |
pipeline_->Start( |
CreateFilterCollection(source, NULL), |
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)), |
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)), |
- QuitOnStatusCB(PIPELINE_OK)); |
+ QuitOnStatusCB(PIPELINE_OK), |
+ base::Bind(&PipelineIntegrationTest::OnReadyState, |
+ base::Unretained(this))); |
message_loop_.Run(); |
} |
@@ -196,11 +200,15 @@ class PipelineIntegrationTest |
void StartPipelineWithEncryptedMedia( |
MockMediaSource* source, |
FakeDecryptorClient* encrypted_media) { |
+ EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveMetadata)); |
+ EXPECT_CALL(*this, OnReadyState(Pipeline::kHaveEnoughData)); |
pipeline_->Start( |
CreateFilterCollection(source, encrypted_media->decryptor()), |
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)), |
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)), |
- QuitOnStatusCB(PIPELINE_OK)); |
+ QuitOnStatusCB(PIPELINE_OK), |
+ base::Bind(&PipelineIntegrationTest::OnReadyState, |
+ base::Unretained(this))); |
source->set_decryptor_client(encrypted_media); |