Fix mime type mappings when the unified media pipeline is enabled.

media/base/mime_util.h

Index: media/base/mime_util.h
diff --git a/media/base/mime_util.h b/media/base/mime_util.h
index 147d401828cc98d53a0f66624ebe674ac1693e9c..6a49eba2a6e0ea5dd55b80bfc0b1c5c117b6f1a3 100644
--- a/media/base/mime_util.h
+++ b/media/base/mime_util.h
@@ -25,19 +25,16 @@ MEDIA_EXPORT void ParseCodecString(const std::string& codecs,
                                    std::vector<std::string>* codecs_out,
                                    bool strip);
 
-// Indicates that the MIME type and (possible codec string) are supported by the
-// underlying platform.
+// Indicates that the MIME type and (possible codec string) are supported.
 enum SupportsType {
-  // The underlying platform is known not to support the given MIME type and
-  // codec combination.
+  // The given MIME type and codec combination is not supported.
   IsNotSupported,
 
-  // The underlying platform is known to support the given MIME type and codec
-  // combination.
+  // The given MIME type and codec combination is supported.
   IsSupported,
 
-  // The underlying platform is unsure whether the given MIME type and codec
-  // combination can be rendered or not before actually trying to play it.
+  // There's not enough information to determine if the given MIME type and
+  // codec combination can be rendered or not before actually trying to play it.
   MayBeSupported
 };
 
@@ -56,6 +53,11 @@ MEDIA_EXPORT SupportsType
 IsSupportedMediaFormat(const std::string& mime_type,
                        const std::vector<std::string>& codecs);
 
+// Similar to the above, but for encrypted formats.
+MEDIA_EXPORT SupportsType
+IsSupportedEncryptedMediaFormat(const std::string& mime_type,
+                                const std::vector<std::string>& codecs);
+
 // Test only method that removes proprietary media types and codecs from the
 // list of supported MIME types and codecs. These types and codecs must be
 // removed to ensure consistent layout test results across all Chromium