| 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 ba65f65977ea3faf6c69915c2fd82668159cae90..8169331c87d5c137255f8de55af70c61ea5b565e 100644
|
| --- a/chrome/renderer/media/chrome_key_systems.cc
|
| +++ b/chrome/renderer/media/chrome_key_systems.cc
|
| @@ -134,6 +134,8 @@ static void AddExternalClearKey(
|
| "org.chromium.externalclearkey.decryptonly";
|
| static const char kExternalClearKeyFileIOTestKeySystem[] =
|
| "org.chromium.externalclearkey.fileiotest";
|
| + static const char kExternalClearKeyOutputProtectionTestKeySystem[] =
|
| + "org.chromium.externalclearkey.outputprotectiontest";
|
| static const char kExternalClearKeyInitializeFailKeySystem[] =
|
| "org.chromium.externalclearkey.initializefail";
|
| static const char kExternalClearKeyCrashKeySystem[] =
|
| @@ -154,10 +156,14 @@ static void AddExternalClearKey(
|
| concrete_key_systems->emplace_back(
|
| new ExternalClearKeyProperties(kExternalClearKeyDecryptOnlyKeySystem));
|
|
|
| - // A key system that triggers FileIO test in ClearKeyCdm.
|
| + // A key system that triggers the FileIO test in ClearKeyCdm.
|
| concrete_key_systems->emplace_back(
|
| new ExternalClearKeyProperties(kExternalClearKeyFileIOTestKeySystem));
|
|
|
| + // A key system that triggers the output protection test in ClearKeyCdm.
|
| + concrete_key_systems->emplace_back(new ExternalClearKeyProperties(
|
| + kExternalClearKeyOutputProtectionTestKeySystem));
|
| +
|
| // 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.
|
|
|