EME: Ensure that registered codecs match the MIME type.

media/base/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 MEDIA_BASE_KEY_SYSTEMS_H_
 #define MEDIA_BASE_KEY_SYSTEMS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 74 matching lines @@
 
 #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.
 MEDIA_EXPORT std::string GetPepperType(
     const std::string& concrete_key_system);
 #endif
 
 #if defined(UNIT_TEST)
 // Helper functions to add container/codec types for testing purposes.
-MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32_t mask);
+// Call AddCodecMask() first to ensure the mask values passed to
+// AddMimeTypeCodecMask() already exist.
 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
                                const std::string& codec,
                                uint32_t mask);
+MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type,
+                                       uint32_t mask);
 #endif  // defined(UNIT_TEST)
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_KEY_SYSTEMS_H_