| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 3b456a1b752ce8dbb70d0189ccf42e8ba6aa178a..63a6892c00553c06cbb45245dd6d2d5e24b0d5d2 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -431,9 +431,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
|
| EXPECT_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", 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) {
|
| +TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) {
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| set_need_key_cb(base::Bind(&FakeEncryptedMedia::NeedKey,
|
| base::Unretained(&encrypted_media)));
|
|
|