Chromium Code Reviews| 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 ac35ee2c498d2692ddc77f4a3b4f2b0f07510d09..0afdedc4ff02e3be37b204d632e5cacc854219ee 100644 |
| --- a/media/test/pipeline_integration_test_base.cc |
| +++ b/media/test/pipeline_integration_test_base.cc |
| @@ -75,7 +75,13 @@ void PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB( |
| EmeInitDataType type, |
| const std::vector<uint8_t>& init_data) { |
| DCHECK(!init_data.empty()); |
| - CHECK(!encrypted_media_init_data_cb_.is_null()); |
| + if (encrypted_media_init_data_cb_.is_null()) { |
|
ddorwin
2016/03/02 21:42:12
Would ASSERT/EXPECT_FALSE() be better? Then the te
xhwang
2016/03/02 23:22:40
PipelineIntegrationTestBase is used by PipelineInt
|
| + // TODO(xhwang): Support encrypted media in PipelineIntegrationTestBase. |
| + DLOG(WARNING) << "Encryted media not supported."; |
|
ddorwin
2016/03/02 21:42:12
Encry*p*ted
Supported by the test? "Test does not
|
| + pipeline_status_ = PIPELINE_ERROR_INITIALIZATION_FAILED; |
| + message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
|
DaleCurtis
2016/03/03 00:17:59
Oy, I forgot we use this in this file, we should c
xhwang
2016/03/03 00:38:47
sgtm. In a different CL though :)
|
| + return; |
| + } |
| encrypted_media_init_data_cb_.Run(type, init_data); |
| } |