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

media/base/media.cc

 // Copyright 2013 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.
 
 #include "media/base/media.h"
 
-#include "base/files/file_path.h"
+#include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
-#include "base/path_service.h"
-#include "base/synchronization/lock.h"
+#include "base/metrics/field_trial.h"
 #include "base/trace_event/trace_event.h"
-#include "build/build_config.h"
+#include "media/base/media_switches.h"
 #include "media/base/yuv_convert.h"
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/ffmpeg/ffmpeg_common.h"
 #endif
 
 namespace media {
 
 // Media must only be initialized once, so use a LazyInstance to ensure this.
 class MediaInitializer {
@@ skipping 30 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MediaInitializer);
 };
 
 static base::LazyInstance<MediaInitializer>::Leaky g_media_library =
     LAZY_INSTANCE_INITIALIZER;
 
 void InitializeMediaLibrary() {
   g_media_library.Get();
 }
 
+#if defined(OS_ANDROID)
+bool IsUnifiedMediaPipelineEnabled() {
+  // 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);
+  return enabled_via_cli ||
+         base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
+}
+#endif
+
 }  // namespace media