Index: media/base/key_systems.cc |
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc |
index 4567bf4c614a12bb8d46c1f758f44e302c5434ca..25676ba46bbc54debca30122d734707cf7231573 100644 |
--- a/media/base/key_systems.cc |
+++ b/media/base/key_systems.cc |
@@ -410,14 +410,19 @@ void KeySystemsImpl::AddSupportedKeySystems( |
// Distinctive identifiers and persistent state can only be reliably blocked |
// (and therefore be safely configurable) for Pepper-hosted key systems. For |
- // other platforms, (except for the AES decryptor) assume that the CDM can |
- // and will do anything. |
+ // other platforms assume the CDM can and will do anything, except for the |
+ // following two cases: |
+ // 1) AES decryptor, and |
+ // 2) External Clear Key key system on Android, only enabled for testing. |
bool can_block = properties->UseAesDecryptor(); |
#if defined(ENABLE_PEPPER_CDMS) |
DCHECK_EQ(properties->UseAesDecryptor(), |
properties->GetPepperType().empty()); |
if (!properties->GetPepperType().empty()) |
can_block = true; |
+#elif defined(OS_ANDROID) |
+ if (IsExternalClearKey(properties->GetKeySystemName())) |
+ can_block = true; |
#endif |
if (!can_block) { |
DCHECK(properties->GetDistinctiveIdentifierSupport() == |