EME: Check for invalid Key System names on addition

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 675df7b3960760978597bb32a6a92d89e245066f..fab743252d9f227af048d2fae5b6f52c493b4548 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -377,6 +377,13 @@ void KeySystemsImpl::AddSupportedKeySystems(
     DCHECK(properties->GetDistinctiveIdentifierSupport() !=
            EmeFeatureSupport::INVALID);
 
+    if (!IsPotentiallySupportedKeySystem(properties->GetKeySystemName())) {
+      // If you encounter this path, see the comments for the function above.
+      DLOG(ERROR) << "Unsupported name '" << properties->GetKeySystemName()
+                  << "'. See code comments.";
+      continue;
+    }
+
     // Supporting persistent state is a prerequsite for supporting persistent
     // sessions.
     if (properties->GetPersistentStateSupport() ==
@@ -547,15 +554,6 @@ bool KeySystemsImpl::IsSupportedKeySystem(const std::string& key_system) const {
   if (!key_system_properties_map_.count(key_system))
     return false;
 
-  // TODO(ddorwin): Move this to where we add key systems when prefixed EME is
-  // removed (crbug.com/249976).
-  if (!IsPotentiallySupportedKeySystem(key_system)) {
-    // If you encounter this path, see the comments for the above function.
-    DLOG(ERROR) << "Unrecognized key system " << key_system
-                << ". See code comments.";
-    return false;
-  }
-
   return true;
 }