Explicitly register each key system.

content/renderer/media/crypto/key_systems.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 // * Abstract key system
 //    A key system string that cannot be instantiated like a concrete key system
 //    but is otherwise useful, such as in discovery using isTypeSupported().
 // * Parent key system
 //    A key system string that is one level up from the child key system. It may
 //    be an abstract key system.
 //    As an example, "com.example" is the parent of "com.example.foo".
 
 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.
 // Call IsSupportedKeySystemWithMediaMimeType() to determine whether a
 // |key_system| supports a specific type of media or to check parent key
 // systems.
 CONTENT_EXPORT bool IsConcreteSupportedKeySystem(
     const WebKit::WebString& key_system);
 
 // Returns whether |key_sytem| supports the specified media type and codec(s).
 CONTENT_EXPORT bool IsSupportedKeySystemWithMediaMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs,
     const std::string& key_system);
 
 // Returns a name for |key_system| suitable to UMA logging.
 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|.
 // Returns empty string if |concrete_key_system| is unknown or not Pepper-based.
 CONTENT_EXPORT std::string GetPepperType(
     const std::string& concrete_key_system);
 #endif
 
 #if defined(OS_ANDROID)
 // Convert |concrete_key_system| to 16-byte Android UUID.
 CONTENT_EXPORT std::vector<uint8> GetUUID(
     const std::string& concrete_key_system);
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_KEY_SYSTEMS_H_