Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: content/browser/encrypted_media_browsertest.cc

Issue 11139008: Change WebM parser to treat IVs from encrypted WebM as raw data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/crypto/aes_decryptor_unittest.cc » ('j') | media/crypto/aes_decryptor_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/encrypted_media_browsertest.cc
diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc
index 7958aec01e1f29daf1692925e723b464da41d5a4..e45d36b2d5ac8e388fe8b117fcc0b9ec1e4bda3e 100644
--- a/content/browser/encrypted_media_browsertest.cc
+++ b/content/browser/encrypted_media_browsertest.cc
@@ -98,9 +98,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected));
}
#else
-// TODO(fgalligan): Enable after WebM parser has been updated.
-// http://crbug.com/155641
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback) {
const string16 kExpected = ASCIIToUTF16("ENDED");
ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected));
}
@@ -112,15 +110,11 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected));
}
-// TODO(fgalligan): Enable after WebM parser has been updated.
-// http://crbug.com/155641
-INSTANTIATE_TEST_CASE_P(DISABLED_ClearKey, EncryptedMediaTest,
+INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
::testing::Values(kClearKeyKeySystem));
// http://crbug.com/152864
#if !defined(OS_MACOSX)
-// TODO(fgalligan): Enable after WebM parser has been updated.
-// http://crbug.com/155641
-INSTANTIATE_TEST_CASE_P(DISABLED_ExternalClearKey, EncryptedMediaTest,
+INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
::testing::Values(kExternalClearKeyKeySystem));
#endif
« no previous file with comments | « no previous file | media/crypto/aes_decryptor_unittest.cc » ('j') | media/crypto/aes_decryptor_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698