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

media/mojo/services/utility_mojo_media_client.cc

Index: media/mojo/services/utility_mojo_media_client.cc
diff --git a/media/mojo/services/utility_mojo_media_client.cc b/media/mojo/services/utility_mojo_media_client.cc
index 5f144e3c761c60ccb1c2ff17c280f5a347f1758c..fd3d0d1cadd1cf919114a980741676ae48c37e43 100644
--- a/media/mojo/services/utility_mojo_media_client.cc
+++ b/media/mojo/services/utility_mojo_media_client.cc
@@ -8,6 +8,7 @@
 #include "media/audio/null_audio_sink.h"
 #include "media/base/media.h"
 #include "media/base/video_decoder.h"
+#include "media/filters/default_demuxer_factory.h"
 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/common/mojo_video_frame_provider.h"
 #include "media/mojo/common/mojo_video_frame_provider_factory.h"
@@ -20,6 +21,10 @@
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
 
+#if !defined(MEDIA_DISABLE_LIBVPX)
+#include "media/filters/vpx_video_decoder.h"
+#endif
+
 namespace media {
 
 UtilityMojoMediaClient::UtilityMojoMediaClient(
@@ -68,4 +73,9 @@ std::unique_ptr<RendererFactory> UtilityMojoMediaClient::CreateRendererFactory(
       std::move(video_frame_provider_factory));
 }
 
+std::unique_ptr<DemuxerFactory> UtilityMojoMediaClient::CreateDemuxerFactory(
+    const scoped_refptr<MediaLog>& media_log) {
+  return base::MakeUnique<DefaultDemuxerFactory>(std::move(media_log));
+}
+
 }  // namespace media