[DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features

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 60145c2b47d981608ae9c0ab29df9447077b1875..d7a721b312be3619811f4d722e7cb4e8dfa29d29 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -145,6 +145,7 @@
 #include "media/blink/url_index.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/blink/webmediaplayer_impl.h"
+#include "media/media_features.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/edk/js/core.h"
@@ -222,6 +223,10 @@
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #endif
 
+#if BUILDFLAG(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
+#include "media/base/android/media_player_renderer_factory.h"
+#endif
+
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
 #include "content/renderer/media/cdm/render_cdm_factory.h"
@@ -2604,18 +2609,27 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
                  base::Unretained(blink::mainThreadIsolate())),
       initial_cdm, media_surface_manager_, media_session);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !BUILDFLAG(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
   if (!UseWebMediaPlayerImpl(url)) {
     return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
   }
 #endif  // defined(OS_ANDROID)
 
-#if defined(ENABLE_MOJO_RENDERER)
+#if BUILDFLAG(FORCE_MOJO_MEDIA_PLAYER_RENDERER)
+  std::unique_ptr<media::RendererFactory> media_renderer_factory(
+      new media::MediaPlayerRendererFactory(

[xhwang, 2016/06/22 17:39:02]

ServiceRegistryImpl() is actually a shell::mojom::InterfaceProvider, the same
type as GetMediaInterfaceProvider(). So I feel you can just reuse
media::MojoRendererFactory here, but use a different
shell::mojom::InterfaceProvider (i.e. GetRemoteInterfaces().get()).

+          base::Bind(&RenderThreadImpl::GetGpuFactories,
+                     base::Unretained(render_thread)),
+          base::Bind(&RenderFrameImpl::GetInterface<media::mojom::Renderer>,
+                     base::Unretained(this)),
+          GURL(url)));
+#elif defined(ENABLE_MOJO_RENDERER)
   std::unique_ptr<media::RendererFactory> media_renderer_factory(
       new media::MojoRendererFactory(
           base::Bind(&RenderThreadImpl::GetGpuFactories,
                      base::Unretained(render_thread)),
-          GetMediaInterfaceProvider()));
+          GetMediaInterfaceProvider()),
+      GURL(url));

[xhwang, 2016/06/22 17:39:02]

Do you need |url| in both MojoRendererFactory and MediaPlayerRendererFactory?

Actually why do we need the URL in any of them? I though we are getting the URL
from the new UrlDemuxerStreamProvider?

 #else
   std::unique_ptr<media::RendererFactory> media_renderer_factory =
       GetContentClient()->renderer()->CreateMediaRendererFactory(