| 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 81cda8427ca00cc668c8c2aec2cf4ce43d13a90e..1412ba814f7f475e0007145ea3f2c14a964ce684 100644
|
| --- a/media/test/pipeline_integration_test_base.cc
|
| +++ b/media/test/pipeline_integration_test_base.cc
|
| @@ -121,6 +121,10 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
|
| base::Unretained(this)));
|
| }
|
|
|
| + // Should never be called as the required decryption keys for the encrypted
|
| + // media files are provided in advance.
|
| + EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
|
| +
|
| pipeline_->Start(
|
| demuxer_.get(), CreateRenderer(),
|
| base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
|
| @@ -134,7 +138,9 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
|
| base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
|
| base::Unretained(this)),
|
| base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack,
|
| - base::Unretained(this)));
|
| + base::Unretained(this)),
|
| + base::Bind(&PipelineIntegrationTestBase::OnWaitingForDecryptionKey,
|
| + base::Unretained(this)));
|
| message_loop_.Run();
|
| return pipeline_status_;
|
| }
|
|
|