media: Add External Clear Key content browser test on Android

media/base/key_systems.cc

Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 4567bf4c614a12bb8d46c1f758f44e302c5434ca..db4634687229aacd9b86992b3382464d7e54c530 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -410,7 +410,8 @@ 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
+    // other platforms, (except for the AES decryptor and External Clear Key
+    // key system on Android, only enabled for testing) assume that the CDM can

[ddorwin, 2016/09/16 19:40:07]

nit: It's not clear exactly what is only enabled for testing. AES decryptor is
not just for testing.

[xhwang, 2016/09/16 20:02:16]

Done.

     // and will do anything.
     bool can_block = properties->UseAesDecryptor();
 #if defined(ENABLE_PEPPER_CDMS)
@@ -418,6 +419,9 @@ void KeySystemsImpl::AddSupportedKeySystems(
               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() ==