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

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index bb2156a285c74eaaef452b2e81c7f5b534d43756..87ec1769357164e11f47a1e0746ee041e9e29152 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -133,6 +133,7 @@
 #include "gin/modules/module_registry.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_renderer_mixer_input.h"
+#include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/blink/url_index.h"
@@ -2497,22 +2498,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
   if (!CanUseWebMediaPlayerImpl(load_type, url)) {
     return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
   } else if (!MustUseWebMediaPlayerImpl(load_type, url)) {
-    // TODO(dalecurtis): This experiment is temporary and should be removed once
-    // we have enough data to support the primacy of the unified media pipeline;
-    // see http://crbug.com/533190 for details.
-    //
-    // Note: It's important to query the field trial state first, to ensure that
-    // UMA reports the correct group.
-    const std::string group_name =
-        base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial");
-    const bool enabled_via_cli =
-        base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableUnifiedMediaPipeline);
-    const bool enable_unified_media_pipeline =
-        enabled_via_cli ||
-        base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
-
-    if (!enable_unified_media_pipeline)
+    if (media::IsUnifiedMediaPipelineEnabled())

[ddorwin, 2016/02/11 21:08:24]

Is this logic backwards?

[DaleCurtis, 2016/02/11 22:04:53]

Whoops, yes I dropped the ! while editing.

       return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
   }
 #endif  // defined(OS_ANDROID)