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..f38d5e54899cf393a0a976f7bb1c1de03b9d9081 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,17 @@ namespace media {
 // features.
 MEDIA_EXPORT void InitializeMediaLibrary();
 
+// Tells the media library it has support for OS level decoders.
+MEDIA_EXPORT void EnablePlatformDecoderSupport();

[ddorwin, 2016/02/16 20:34:37]

This is only called for Android. Should these be ifdef'd?

[DaleCurtis, 2016/02/17 03:01:05]

Done.

+MEDIA_EXPORT bool HasPlatformDecoderSupport();
+
+#if defined(OS_ANDROID)
+// 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();

[ddorwin, 2016/02/16 20:34:37]

// Returns only whether the pipeline is enabled. It may not actually be
available, such as due to blacklisting.

[DaleCurtis, 2016/02/17 03:01:05]

Done.

+MEDIA_EXPORT bool IsUnifiedMediaPipelineEnabledForMse();
+#endif
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_H_