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

Unified Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 79903002: Add decrypt-only external clear key browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 7 years, 1 month 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
Index: chrome/renderer/media/chrome_key_systems.cc
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index 0372a80e95ab067e458edfcd095e49499652f3c8..0af0a1a1e1ede657a355b256538411770f1d409a 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -64,6 +64,10 @@ static void AddExternalClearKey(
std::vector<KeySystemInfo>* concrete_key_systems) {
static const char kExternalClearKeyKeySystem[] =
"org.chromium.externalclearkey";
+ static const char kExternalClearKeyDecryptOnlyKeySystem[] =
+ "org.chromium.externalclearkey.decryptonly";
+ static const char kExternalClearKeyInitializeFailKeySystem[] =
+ "org.chromium.externalclearkey.initializefail";
static const char kExternalClearKeyPepperType[] =
"application/x-ppapi-clearkey-cdm";
@@ -90,7 +94,11 @@ static void AddExternalClearKey(
// A key system that Chrome thinks is supported by ClearKeyCdm, but actually
// will be refused by ClearKeyCdm. This is to test the CDM initialization
// failure case.
- info.key_system += ".initializefail";
+ info.key_system = kExternalClearKeyInitializeFailKeySystem;
+ concrete_key_systems->push_back(info);
+
+ // Add support of decrypt-only mode in ClearKeyCdm.
+ info.key_system = kExternalClearKeyDecryptOnlyKeySystem;
concrete_key_systems->push_back(info);
}
#endif // defined(ENABLE_PEPPER_CDMS)
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/test/data/media/encrypted_media_utils.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698