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

media/base/media.h

 // Copyright (c) 2012 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.
 
 // Contains code that should be used for initializing, or querying the state
 // of the media library as a whole.
 
 #ifndef MEDIA_BASE_MEDIA_H_
 #define MEDIA_BASE_MEDIA_H_
 
+#include "build/build_config.h"
 #include "media/base/media_export.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace media {
 
 // Initializes media libraries (e.g. ffmpeg) as well as CPU specific 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_