Add runtime flag for choosing WMPI or WMPA.

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 5a9da313bc67b3f7b2932be454a43784b50d4c8b..60cfde2cfb55ca53055b83104d205d5fe8f0f033 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -116,6 +116,7 @@
 #include "gin/modules/module_registry.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/media_log.h"
+#include "media/base/media_switches.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
@@ -2176,6 +2177,13 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
 #if defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
   return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
 #else
+#if defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)

[no sievers, 2015/11/09 21:32:35]

the combination of compile time switch and runtime switch is confusing :x

[DaleCurtis, 2015/11/09 21:50:48]

Yeah, hopefully it won't live much longer, the problem is the compile flags add
a fair bit of apk size, so we're waiting until we know we can play EME/premium
content on this path and we have all the fallback mechanisms in place before
committing to it.

+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableUnifiedMediaPipeline)) {
+    return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
+  }
+#endif  // defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
+
 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
   scoped_ptr<media::RendererFactory> media_renderer_factory(
       new media::MojoRendererFactory(GetMediaServiceFactory()));
@@ -2190,7 +2198,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
         *render_thread->GetAudioHardwareConfig()));
   }
 #endif  // defined(ENABLE_MOJO_MEDIA) &&
-  // !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
+        // !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
 
   return new media::WebMediaPlayerImpl(
       frame, client, encrypted_client, weak_factory_.GetWeakPtr(),