Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process

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 44be337317f9e807959c2a74ef2486f774dab022..505ebfdd1741e46f87a7e0a84349547bf06d3b9e 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -257,6 +257,12 @@
 #include "media/mojo/clients/mojo_cdm_factory.h"  // nogncheck
 #endif
 
+#if defined(ENABLE_MOJO_DEMUXER)
+#include "media/mojo/clients/mojo_demuxer_factory.h"  // nogncheck
+#else
+#include "media/filters/default_demuxer_factory.h"
+#endif
+
 #if defined(ENABLE_MOJO_RENDERER)
 #include "media/mojo/clients/mojo_renderer_factory.h"  // nogncheck
 #endif
@@ -2859,6 +2865,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
   use_fallback_path = !UseWebMediaPlayerImpl(url);
 #endif  // defined(OS_ANDROID)
 
+  std::unique_ptr<media::DemuxerFactory> media_demuxer_factory;
   std::unique_ptr<media::RendererFactory> media_renderer_factory;
   if (use_fallback_path) {
 #if defined(OS_ANDROID)
@@ -2875,6 +2882,14 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
                    base::ThreadTaskRunnerHandle::Get()));
 #endif  // defined(OS_ANDROID)
   } else {
+#if defined(ENABLE_MOJO_DEMUXER) && defined(ENABLE_MOJO_RENDERER)
+    media_demuxer_factory = base::MakeUnique<media::MojoDemuxerFactory>(
+        GetMediaInterfaceProvider());
+#else
+    media_demuxer_factory =
+        base::MakeUnique<media::DefaultDemuxerFactory>(media_log);
+#endif
+
 #if defined(ENABLE_MOJO_RENDERER)
 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -2912,7 +2927,8 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
-      std::move(media_renderer_factory), url_index_, params);
+      std::move(media_demuxer_factory), std::move(media_renderer_factory),
+      url_index_, params);
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   media_player->SetMediaPlayerManager(GetMediaPlayerManager());