| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index da8b26f5c2af0f9b4fdbb2f81f81d76848203799..57ef714ef8c6e82567c278fa9e8720459bc4fbda 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -424,6 +424,22 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
|
| // EXPECT_EQ(GetAudioHash(), "");
|
| }
|
|
|
| +// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands
|
| +// in Chromium's FFmpeg.
|
| +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-640x360-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);
|
|
|