Move ownership of audio/video sinks to MojoRendererService.

media/mojo/services/service_factory_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 26 matching lines @@
   ~ServiceFactoryImpl() final;
 
   // mojom::ServiceFactory implementation.
   void CreateAudioDecoder(mojom::AudioDecoderRequest request) final;
   void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;
   void CreateRenderer(const mojo::String& audio_device_id,
                       mojom::RendererRequest request) final;
   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_;
   MojoMediaClient* mojo_media_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_