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

media/mojo/clients/mojo_renderer_unittest.cc

Index: media/mojo/clients/mojo_renderer_unittest.cc
diff --git a/media/mojo/clients/mojo_renderer_unittest.cc b/media/mojo/clients/mojo_renderer_unittest.cc
index 3ed48d10e293520e9b5e715ca3eb6689a65610c4..d3cf06516eec31994cc2f387b46ed2b2e738416a 100644
--- a/media/mojo/clients/mojo_renderer_unittest.cc
+++ b/media/mojo/clients/mojo_renderer_unittest.cc
@@ -26,6 +26,7 @@
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/services/mojo_cdm_service.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
+#include "media/mojo/services/mojo_demuxer_service_context.h"
 #include "media/mojo/services/mojo_renderer_service.h"
 #include "media/renderers/video_overlay_factory.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
@@ -65,6 +66,7 @@ class MojoRendererTest : public ::testing::Test {
 
     mojom::RendererPtr remote_renderer;
     renderer_binding_ = MojoRendererService::Create(
+        mojo_demuxer_service_context_.GetWeakPtr(),
         mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr,
         std::move(mock_renderer),
         MojoRendererService::InitiateSurfaceRequestCB(),
@@ -214,6 +216,7 @@ class MojoRendererTest : public ::testing::Test {
   // Service side mocks and helpers.
   StrictMock<MockRenderer>* mock_renderer_;
   MojoCdmServiceContext mojo_cdm_service_context_;
+  MojoDemuxerServiceContext mojo_demuxer_service_context_;
   RendererClient* remote_renderer_client_;
   DefaultCdmFactory cdm_factory_;