| 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 c7c144d3a837088943689195ce7bbcc75114e894..0b54e009852ca4b932eb1b5bbf42671c6ed45e12 100644
|
| --- a/media/mojo/services/service_factory_impl.h
|
| +++ b/media/mojo/services/service_factory_impl.h
|
| @@ -47,20 +47,25 @@ class ServiceFactoryImpl : public interfaces::ServiceFactory {
|
| mojo::InterfaceRequest<interfaces::ContentDecryptionModule> cdm) final;
|
|
|
| private:
|
| +#if defined(ENABLE_MOJO_RENDERER)
|
| RendererFactory* GetRendererFactory();
|
| +
|
| + scoped_ptr<RendererFactory> renderer_factory_;
|
| +#endif // defined(ENABLE_MOJO_RENDERER)
|
| +
|
| +#if defined(ENABLE_MOJO_CDM)
|
| CdmFactory* GetCdmFactory();
|
|
|
| - MojoCdmServiceContext cdm_service_context_;
|
| + scoped_ptr<CdmFactory> cdm_factory_;
|
| +#endif // defined(ENABLE_MOJO_CDM)
|
|
|
| + MojoCdmServiceContext cdm_service_context_;
|
| mojo::StrongBinding<interfaces::ServiceFactory> binding_;
|
| mojo::shell::mojom::InterfaceProvider* interfaces_;
|
| scoped_refptr<MediaLog> media_log_;
|
| scoped_ptr<mojo::MessageLoopRef> parent_app_refcount_;
|
| MojoMediaClient* mojo_media_client_;
|
|
|
| - scoped_ptr<RendererFactory> renderer_factory_;
|
| - scoped_ptr<CdmFactory> cdm_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
|
| };
|
|
|
|
|