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

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

Issue 2267283002: media: Separate renewal from default External Clear Key test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 8169331c87d5c137255f8de55af70c61ea5b565e..4c02dfef7c97eda34796c3a5912198881f8c843f 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -132,6 +132,8 @@ static void AddExternalClearKey(
"org.chromium.externalclearkey";
static const char kExternalClearKeyDecryptOnlyKeySystem[] =
"org.chromium.externalclearkey.decryptonly";
+ static const char kExternalClearKeyRenewalKeySystem[] =
+ "org.chromium.externalclearkey.renewal";
static const char kExternalClearKeyFileIOTestKeySystem[] =
"org.chromium.externalclearkey.fileiotest";
static const char kExternalClearKeyOutputProtectionTestKeySystem[] =
@@ -156,6 +158,10 @@ static void AddExternalClearKey(
concrete_key_systems->emplace_back(
new ExternalClearKeyProperties(kExternalClearKeyDecryptOnlyKeySystem));
+ // A key system that triggers renewal message in ClearKeyCdm.
+ concrete_key_systems->emplace_back(
+ new ExternalClearKeyProperties(kExternalClearKeyRenewalKeySystem));
+
// A key system that triggers the FileIO test in ClearKeyCdm.
concrete_key_systems->emplace_back(
new ExternalClearKeyProperties(kExternalClearKeyFileIOTestKeySystem));
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698