media: Enable Unified Media Pipeline for MSE and EME on Android

media/base/media.cc

Index: media/base/media.cc
diff --git a/media/base/media.cc b/media/base/media.cc
index b2e1c4520174e7a04fb50c393dd3c32646700d2d..80d88d9f32369d49b4209876fd32d1414e5022c2 100644
--- a/media/base/media.cc
+++ b/media/base/media.cc
@@ -74,6 +74,14 @@ void InitializeMediaLibrary() {
   g_media_library.Get();
 }
 
+bool IsMojoCdmEnabled() {

[ddorwin, 2016/03/24 18:05:11]

Should this be ifdef'd to ENABLE_MOJO_CDMS?

[xhwang, 2016/03/24 21:26:04]

Good point. Actually "media" should not know about "mojo media" at all. Also
ENABLE_MOJO_CDMS is defined in media/mojo so we can't use it here.

Since this is only used in RenderFrameImpl and there we have the best context,
moved this function to be a static function in RenderFrameImpl.

+#if defined(OS_ANDROID)
+  return IsUnifiedMediaPipelineEnabled();
+#else
+  return true;
+#endif
+}
+
 #if defined(OS_ANDROID)
 void EnablePlatformDecoderSupport() {
   g_media_library.Pointer()->enable_platform_decoder_support();
@@ -107,15 +115,6 @@ bool IsUnifiedMediaPipelineEnabled() {
          base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
 }
 
-bool IsUnifiedMediaPipelineEnabledForMse() {
-  // Don't check IsUnifiedMediaPipelineEnabled() here since we don't want MSE to
-  // be enabled via experiment yet; only when the existing implementation can't
-  // be used (i.e. MediaCodec unavailable).
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableUnifiedMediaPipeline) ||
-         !MediaCodecUtil::IsMediaCodecAvailable();
-}
-
 bool ArePlatformDecodersAvailable() {
   return IsUnifiedMediaPipelineEnabled()
              ? HasPlatformDecoderSupport()