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

media/base/media.h

Index: media/base/media.h
diff --git a/media/base/media.h b/media/base/media.h
index 01a913bc45ff956702377f097a036015951821f0..36899a4662c26f2f629c59d2448c877d0b46f258 100644
--- a/media/base/media.h
+++ b/media/base/media.h
@@ -8,6 +8,7 @@
 #ifndef MEDIA_BASE_MEDIA_H_
 #define MEDIA_BASE_MEDIA_H_
 
+#include "build/build_config.h"
 #include "media/base/media_export.h"
 
 namespace base {
@@ -20,6 +21,26 @@ namespace media {
 // features.
 MEDIA_EXPORT void InitializeMediaLibrary();
 
+#if defined(OS_ANDROID)
+// Tells the media library it has support for OS level decoders.

[ddorwin, 2016/02/17 21:18:38]

This only applies to MediaCodec, not MediaPlayer. :)

[DaleCurtis, 2016/02/18 03:58:08]

Done.

+MEDIA_EXPORT void EnablePlatformDecoderSupport();
+MEDIA_EXPORT bool HasPlatformDecoderSupport();
+
+// Returns true if the unified media pipeline is enabled; the pipeline may still
+// not work for all codecs if HasPlatformDecoderSupport() is false.  Please see
+// MimeUtil for an exhaustive listing of supported codecs.
+//
+// TODO(dalecurtis): These methods are temporary and should be removed once the
+// unified media pipeline is supported everywhere.  http://crbug.com/580626.
+MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabled();
+
+// Similar to IsUnifiedMediaPipelineEnabled() but will also return true if
+// MediaCodec is not available (allowing the unified pipeline to take over for
+// cases where existing pipeline has no support). As above, codecs requiring
+// platform support may not be available.
+MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabledForMse();
+#endif
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_H_