| Index: media/mojo/services/mojo_media_client.h
|
| diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h
|
| index 88acb3061d653e228d6f99cdbb96732f099187aa..1cd41302b511b537f44d7158a53793bef88a8925 100644
|
| --- a/media/mojo/services/mojo_media_client.h
|
| +++ b/media/mojo/services/mojo_media_client.h
|
| @@ -16,10 +16,6 @@
|
| #include "media/base/renderer_factory.h"
|
| #include "media/base/video_decoder.h"
|
| #include "media/base/video_renderer_sink.h"
|
| -
|
| -namespace mojo {
|
| -class ServiceProvider;
|
| -}
|
|
|
| namespace media {
|
|
|
| @@ -57,8 +53,7 @@
|
| virtual const AudioHardwareConfig* GetAudioHardwareConfig();
|
|
|
| // Returns the CdmFactory to be used by MojoCdmService.
|
| - virtual scoped_ptr<CdmFactory> CreateCdmFactory(
|
| - mojo::ServiceProvider* service_provider);
|
| + virtual scoped_ptr<CdmFactory> CreateCdmFactory();
|
| };
|
|
|
| class MojoMediaClient {
|
| @@ -80,8 +75,7 @@
|
| scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
|
| const AudioHardwareConfig* GetAudioHardwareConfig();
|
| - scoped_ptr<CdmFactory> CreateCdmFactory(
|
| - mojo::ServiceProvider* service_provider);
|
| + scoped_ptr<CdmFactory> CreateCdmFactory();
|
|
|
| private:
|
| friend struct base::DefaultLazyInstanceTraits<MojoMediaClient>;
|
|
|