Index: media/filters/pipeline_integration_test.cc |
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc |
index 57f1483b1909b8a469acab98c115962dc7ad5e67..1bb971daf80a4467ed9240bd33bde78f2b3973f0 100644 |
--- a/media/filters/pipeline_integration_test.cc |
+++ b/media/filters/pipeline_integration_test.cc |
@@ -19,8 +19,8 @@ static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 }; |
// Key used to encrypt video track in test file "bear-320x240-encrypted.webm". |
static const uint8 kSecretKey[] = { |
- 0xfb, 0x67, 0x8a, 0x91, 0x19, 0x12, 0x7b, 0x6b, |
- 0x0b, 0x63, 0x11, 0xf8, 0x6f, 0xe1, 0xc4, 0x2d |
+ 0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b, |
+ 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c |
}; |
// Helper class that emulates calls made on the ChunkDemuxer by the |
@@ -290,10 +290,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { |
ASSERT_TRUE(WaitUntilOnEnded()); |
} |
-// TODO(fgalligan): Enable test when encrypted test data is updated and new |
-// decryption code is landed. http://crbug.com/132801 |
-TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { |
- MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true); |
+TEST_F(PipelineIntegrationTest, EncryptedPlayback) { |
+ MockMediaSource source("bear-320x240-encrypted.webm", 220788, true, true); |
FakeDecryptorClient encrypted_media; |
StartPipelineWithEncryptedMedia(&source, &encrypted_media); |