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

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: 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..19d19dfcf20537c3e89a4c04bcbe20238e4ac055 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -64,6 +64,8 @@ static void AddExternalClearKey(
std::vector<KeySystemInfo>* concrete_key_systems) {
static const char kExternalClearKeyKeySystem[] =
"org.chromium.externalclearkey";
+ static const char kDecryptOnlyExternalClearKeyKeySystem[] =
+ "org.chromium.externalclearkey.decryptonly";
static const char kExternalClearKeyPepperType[] =
"application/x-ppapi-clearkey-cdm";
@@ -92,6 +94,10 @@ static void AddExternalClearKey(
// failure case.
info.key_system += ".initializefail";
concrete_key_systems->push_back(info);
+
+ // Add support of decrypt-only mode in ClearKeyCdm.
+ info.key_system = kDecryptOnlyExternalClearKeyKeySystem;
ddorwin 2013/11/21 04:10:58 This and 95 should be consistent.
xhwang 2013/11/22 01:47:36 Done.
+ concrete_key_systems->push_back(info);
}
#endif // defined(ENABLE_PEPPER_CDMS)

Powered by Google App Engine
This is Rietveld 408576698