Initial support for the desktop media pipeline on Android.

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 f4e7528bc0074de772f3643ac0fb13aa411500cc..8c0baab8a4ace60cc044822808e3a25914d3b271 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -169,6 +169,7 @@
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/stream_texture_factory_impl.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
+#include "media/base/media_switches.h"
 #else
 #include "cc/blink/context_provider_web_context.h"
 #endif
@@ -493,7 +494,7 @@ CommonNavigationParams MakeCommonNavigationParams(
                                 ui_timestamp, report_type, GURL(), GURL());
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
 media::Context3D GetSharedMainThreadContext3D() {
   cc::ContextProvider* provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
@@ -1974,9 +1975,17 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
   if (!web_stream.isNull())
     return CreateWebMediaPlayerForMediaStream(client);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)

[liberato (no reviews please), 2015/07/10 17:15:09]

I think that this can simplify slightly to:

#if defined(OS_ANDROID) && !defined(ENABLE)
return WMPA
#else

#if defined(OS_ANDROID)
if (!flag)  return WMPA
#endif

return WMPI
#endif

keeps the cases disjoint, and maybe a little easier to read.

[xhwang, 2015/07/10 17:27:50]

Hmm, it's sad to see "return WMPA" twice.

Actually, why do we have both a gyp variable and a command line flag? Can we
just use one, e.g. the gyp variable, for prototyping/experiment?

[liberato (no reviews please), 2015/07/10 17:32:07]

i agree about the sad.  i tried to restructure this a few times, but couldn't do
it without sometimes returning null if the flag was set without WMPI compiled. 
if we're okay with that...

[watk, 2015/07/10 18:51:25]

Removed

+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableMediaPipelineOnAndroid)) {
+    return CreateAndroidWebMediaPlayer(client, GetMediaPermission(),
+                                       initial_cdm);
+  }
+#elif defined(OS_ANDROID)
   return CreateAndroidWebMediaPlayer(client, GetMediaPermission(), initial_cdm);
-#else
+#endif
+
+#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
   scoped_refptr<media::MediaLog> media_log(new RenderMediaLog());
 
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
@@ -2008,7 +2017,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
   return new media::WebMediaPlayerImpl(
       frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
       GetCdmFactory(), params);
-#endif  // defined(OS_ANDROID)
+#endif  // !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(