From 1ab297a6ed94629078106d7ba4f34f8a35efdc29 Mon Sep 17 00:00:00 2001 From: "jrummell@chromium.org" Date: Wed, 26 Mar 2014 04:52:12 +0000 Subject: [PATCH] Enable browser tests for Pepper-based CDMs Pepper-based CDMs can now be loaded using unprefixed EME, so enable the relevant browser tests. BUG=250049 TEST=newly enabled tests Review URL: https://codereview.chromium.org/211323007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259490 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/media/encrypted_media_browsertest.cc | 16 ++++------------ chrome/test/data/media/encrypted_media_utils.js | 8 ++++++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index 920b4e2eefc7..b66caec1047f 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc @@ -458,9 +458,7 @@ INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey_Prefixed, Combine(Values(kExternalClearKeyKeySystem), Values(SRC), Values(PREFIXED))); -// TODO(jrummell): Enable unprefixed tests once the CDM can be loaded using -// MediaKeys. -INSTANTIATE_TEST_CASE_P(DISABLED_SRC_ExternalClearKey, +INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey, EncryptedMediaTest, Combine(Values(kExternalClearKeyKeySystem), Values(SRC), @@ -470,9 +468,7 @@ INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKey_Prefixed, Combine(Values(kExternalClearKeyKeySystem), Values(MSE), Values(PREFIXED))); -// TODO(jrummell): Enable unprefixed tests once the CDM can be loaded using -// MediaKeys. -INSTANTIATE_TEST_CASE_P(DISABLED_MSE_ExternalClearKey, +INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKey, EncryptedMediaTest, Combine(Values(kExternalClearKeyKeySystem), Values(MSE), @@ -483,9 +479,7 @@ INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly_Prefixed, Combine(Values(kExternalClearKeyDecryptOnlyKeySystem), Values(MSE), Values(PREFIXED))); -// TODO(jrummell): Enable unprefixed tests once the CDM can be loaded using -// MediaKeys. -INSTANTIATE_TEST_CASE_P(DISABLED_MSE_ExternalClearKeyDecryptOnly, +INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly, EncryptedMediaTest, Combine(Values(kExternalClearKeyDecryptOnlyKeySystem), Values(MSE), @@ -501,9 +495,7 @@ INSTANTIATE_TEST_CASE_P(MSE_Widevine_Prefixed, Combine(Values(kWidevineKeySystem), Values(MSE), Values(PREFIXED))); -// TODO(jrummell): Enable unprefixed tests once the CDM can be loaded using -// MediaKeys. -INSTANTIATE_TEST_CASE_P(DISABLED_MSE_Widevine, +INSTANTIATE_TEST_CASE_P(MSE_Widevine, EncryptedMediaTest, Combine(Values(kWidevineKeySystem), Values(MSE), diff --git a/chrome/test/data/media/encrypted_media_utils.js b/chrome/test/data/media/encrypted_media_utils.js index 0029fe387d08..6efa41185ecb 100644 --- a/chrome/test/data/media/encrypted_media_utils.js +++ b/chrome/test/data/media/encrypted_media_utils.js @@ -339,8 +339,12 @@ function requestLicenseTry(message) { if (this.status == 200) { var response = new Uint8Array(this.response); console.log('Adding license response', response); - message.target.webkitAddKey(keySystem, response, new Uint8Array(1), - message.sessionId); + if (usePrefixedEME) { + message.target.webkitAddKey(keySystem, response, new Uint8Array(1), + message.sessionId); + } else { + message.target.update(response); + } // Reset license request count so that renewal requests can be sent later. message.target.licenseRequestAttempts = 0; } else { -- 2.11.4.GIT