| 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 ce970c9c0dccf4c5f9a398576d5f8f0ca7240743..80535716513cb75ad8a48f2fd6daf5d504007ae6 100644
|
| --- a/media/mojo/services/service_factory_impl.h
|
| +++ b/media/mojo/services/service_factory_impl.h
|
| @@ -60,12 +60,10 @@ class ServiceFactoryImpl : public mojom::ServiceFactory {
|
| #if defined(ENABLE_MOJO_CDM)
|
| shell::mojom::InterfaceProvider* interfaces_;
|
| #endif
|
| -#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_CDM) || \
|
| - defined(ENABLE_MOJO_RENDERER)
|
| - MojoMediaClient* mojo_media_client_;
|
| -#endif
|
| +
|
| scoped_refptr<MediaLog> media_log_;
|
| std::unique_ptr<shell::ShellConnectionRef> connection_ref_;
|
| + MojoMediaClient* mojo_media_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
|
| };
|
|
|