chromium/src
0
Fork 0
Code Activity

Update encrypted WebM test file to treat IVs as raw data.

Browse Source 
BUG=155639
TEST=All encrypted content_browsertests pass.
TBR=ddorwin

Review URL: https://codereview.chromium.org/11143004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161687 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
fgalligan@chromium.org
2012-10-13 00:27:03 +00:00
parent cb62dc1416
commit 57c7c36b58
2 changed files with 9 additions and 3 deletions

12
content/browser/encrypted_media_browsertest.cc

@ -98,7 +98,9 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected));
}
#else
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback) {
// TODO(fgalligan): Enable after WebM parser has been updated.
// http://crbug.com/155641
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
const string16 kExpected = ASCIIToUTF16("ENDED");
ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected));
}
@ -110,11 +112,15 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected));
}
INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
// TODO(fgalligan): Enable after WebM parser has been updated.
// http://crbug.com/155641
INSTANTIATE_TEST_CASE_P(DISABLED_ClearKey, EncryptedMediaTest,
::testing::Values(kClearKeyKeySystem));
// http://crbug.com/152864
#if !defined(OS_MACOSX)
INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
// TODO(fgalligan): Enable after WebM parser has been updated.
// http://crbug.com/155641
INSTANTIATE_TEST_CASE_P(DISABLED_ExternalClearKey, EncryptedMediaTest,
::testing::Values(kExternalClearKeyKeySystem));
#endif

BIN
content/test/data/media/bear-320x240-encrypted.webm

Binary file not shown.