Explicitly register each key system.

content/renderer/media/crypto/key_systems.h

Index: content/renderer/media/crypto/key_systems.h
diff --git a/content/renderer/media/crypto/key_systems.h b/content/renderer/media/crypto/key_systems.h
index 1932e1eb33048d6c0f0e83dbcdb35f04277bb29f..bf1b17efbe54a4c601a69b04226104d2b469678d 100644
--- a/content/renderer/media/crypto/key_systems.h
+++ b/content/renderer/media/crypto/key_systems.h
@@ -32,6 +32,31 @@ class WebString;
 
 namespace content {
 
+// Adds a concrete key system along with platform-specific information about how
+// to instantiate it. Must be called before other Add* functions.
+// May only be called once per |key_system|.
+CONTENT_EXPORT void AddConcreteSupportedKeySystem(
+    const std::string& key_system,
+#if defined(ENABLE_PEPPER_CDMS)
+    const std::string& pepper_type,
+#elif defined(OS_ANDROID)
+    const uint8 uuid[16],
+#endif  // defined(ENABLE_PEPPER_CDMS)
+    bool use_aes_decryptor);

[scherkus (not reviewing), 2013/08/27 17:20:37]

what's this thing for?

[ddorwin, 2013/08/27 18:02:49]

It's used to answer to CanUseAesDecryptor(). We could assume this if the
pepper_type/uuid values are "empty". With this API signature, it also serves to
solve the "last parameter after ifdef" issue.

+
+// Adds a mapping from a |parent key system| to a |concrete_key_system|, which
+// can be used for determining supported types.
+CONTENT_EXPORT void AddParentKeySystem(const std::string& parent_key_system,
+                                       const std::string& concrete_key_system);
+
+// Specifies the container and codec combinations supported by |key_system|.
+// Multiple codecs can be listed. In all cases, the container
+// without a codec is also supported.
+// |key_system| must be a concrete supported key system.
+CONTENT_EXPORT void AddSupportedType(const std::string& key_system,
+                                     const std::string& mime_type,
+                                     const std::string& codecs_list);
+
 // Returns whether |key_system| is a real supported key system that can be
 // instantiated.
 // Abstract parent |key_system| strings will return false.
@@ -52,7 +77,7 @@ CONTENT_EXPORT std::string KeySystemNameForUMA(
     const WebKit::WebString& key_system);
 
 // Returns whether AesDecryptor can be used for the given |key_system|.
-CONTENT_EXPORT bool CanUseAesDecryptor(const std::string& key_system);
+CONTENT_EXPORT bool CanUseAesDecryptor(const std::string& concrete_key_system);
 
 #if defined(ENABLE_PEPPER_CDMS)
 // Returns the Pepper MIME type for |concrete_key_system|.