| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 3d6c16b02390691222f9834808d71e48d33c1449..d1720c14156ab9997ce3acf61935dafd793d681b 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -313,6 +313,7 @@ class MockMediaSource {
|
| scoped_array<uint8> init_data, int init_data_size) {
|
| DCHECK(init_data.get());
|
| DCHECK_GT(init_data_size, 0);
|
| + CHECK(!need_key_cb_.is_null());
|
| need_key_cb_.Run("", "", type, init_data.Pass(), init_data_size);
|
| }
|
|
|
| @@ -424,6 +425,22 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
|
| // EXPECT_EQ(GetAudioHash(), "");
|
| }
|
|
|
| +// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands
|
| +// in Chromium's FFmpeg. crbug.com/189221
|
| +TEST_F(PipelineIntegrationTest, DISABLED_BasicPlaybackEncrypted) {
|
| + FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| + set_need_key_cb(base::Bind(&FakeEncryptedMedia::NeedKey,
|
| + base::Unretained(&encrypted_media)));
|
| +
|
| + ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-av_enc-av.webm"),
|
| + encrypted_media.decryptor()));
|
| +
|
| + Play();
|
| +
|
| + ASSERT_TRUE(WaitUntilOnEnded());
|
| + Stop();
|
| +}
|
| +
|
| TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
|
| MockMediaSource source("bear-320x240.webm", kWebM, 219229);
|
| StartPipelineWithMediaSource(&source);
|
|
|