Move ownership of audio/video sinks to MojoRendererService.

media/mojo/services/service_factory_impl.h

Index: media/mojo/services/service_factory_impl.h
diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h
index db56afb303ff7d529d5caf2041ff051a69fdf14d..5407b910eaa30c4291991d2ec9a3a8e72202ab6b 100644
--- a/media/mojo/services/service_factory_impl.h
+++ b/media/mojo/services/service_factory_impl.h
@@ -44,17 +44,25 @@ class ServiceFactoryImpl : public mojom::ServiceFactory {
   void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;
 
  private:
+#if defined(ENABLE_MOJO_RENDERER)
+  RendererFactory* GetRendererFactory();
+#endif  // defined(ENABLE_MOJO_RENDERER)
+
 #if defined(ENABLE_MOJO_CDM)
   CdmFactory* GetCdmFactory();
-
-  std::unique_ptr<CdmFactory> cdm_factory_;
 #endif  // defined(ENABLE_MOJO_CDM)
 
   MojoCdmServiceContext cdm_service_context_;
   mojo::StrongBinding<mojom::ServiceFactory> binding_;
+
+#if defined(ENABLE_MOJO_RENDERER)
+  std::unique_ptr<RendererFactory> renderer_factory_;
+#endif  // defined(ENABLE_MOJO_RENDERER)
+
 #if defined(ENABLE_MOJO_CDM)
+  std::unique_ptr<CdmFactory> cdm_factory_;
   shell::mojom::InterfaceProviderPtr interfaces_;
-#endif
+#endif  // defined(ENABLE_MOJO_CDM)
 
   scoped_refptr<MediaLog> media_log_;
   std::unique_ptr<shell::ServiceContextRef> connection_ref_;