Refactor IsSupportedKeySystemWithMediaMimeType().

media/base/key_systems.h

Index: media/base/key_systems.h
diff --git a/media/base/key_systems.h b/media/base/key_systems.h
index 2ceb7cf24a6ebba9ed04acfce610cd90ec9c1649..a6a8062ff97a7844005d30c5671cba4ed9e5ce96 100644
--- a/media/base/key_systems.h
+++ b/media/base/key_systems.h
@@ -91,8 +91,6 @@ MEDIA_EXPORT bool IsSaneInitDataTypeWithContainer(
 // Use for unprefixed EME only!
 // Returns whether |key_system| is a supported key system.
 // Note: Shouldn't be used for prefixed API as the original
-// IsSupportedKeySystemWithMediaMimeType() path reports UMAs, but this path does
-// not.
 MEDIA_EXPORT bool IsSupportedKeySystem(const std::string& key_system);
 
 MEDIA_EXPORT bool IsSupportedKeySystemWithInitDataType(
@@ -103,19 +101,9 @@ MEDIA_EXPORT bool IsSupportedKeySystemWithInitDataType(
 // 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.
 MEDIA_EXPORT bool PrefixedIsSupportedConcreteKeySystem(
     const std::string& key_system);
 
-// Use for unprefixed EME only!
-// Returns whether |key_system| supports the specified media type and codec(s).
-MEDIA_EXPORT bool IsSupportedKeySystemWithMediaMimeType(
-    const std::string& mime_type,
-    const std::vector<std::string>& codecs,
-    const std::string& key_system);
-
 // Use for prefixed EME only!
 // Returns whether |key_system| supports the specified media type and codec(s).
 // To be used with prefixed EME only as it generates UMAs based on the query.
@@ -140,7 +128,10 @@ MEDIA_EXPORT std::string GetPepperType(
 #if defined(UNIT_TEST)
 // Helper functions to add container/codec types for testing purposes.
 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32 mask);
-MEDIA_EXPORT void AddCodecMask(const std::string& codec, uint32 mask);
+MEDIA_EXPORT void AddCodecMask(
+    EmeMediaType media_type,
+    const std::string& codec,
+    uint32 mask);
 #endif  // defined(UNIT_TEST)
 
 }  // namespace media