| Index: media/mojo/services/mojo_cdm_service.h
|
| diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
|
| index d41ad2f7cdb101289f5384723d7cf24fdea997ba..44df63f4d7911c0c6c2c1b0e8d576a9a1bac626b 100644
|
| --- a/media/mojo/services/mojo_cdm_service.h
|
| +++ b/media/mojo/services/mojo_cdm_service.h
|
| @@ -15,8 +15,6 @@
|
| #include "media/mojo/services/mojo_cdm_promise.h"
|
| #include "media/mojo/services/mojo_cdm_service_context.h"
|
| #include "media/mojo/services/mojo_decryptor_service.h"
|
| -#include "mojo/application/public/interfaces/service_provider.mojom.h"
|
| -#include "mojo/public/cpp/bindings/strong_binding.h"
|
|
|
| namespace media {
|
|
|
| @@ -37,11 +35,8 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
|
| static scoped_refptr<MediaKeys> GetCdm(int cdm_id);
|
|
|
| // Constructs a MojoCdmService and strongly binds it to the |request|.
|
| - MojoCdmService(
|
| - base::WeakPtr<MojoCdmServiceContext> context,
|
| - mojo::ServiceProvider* service_provider,
|
| - CdmFactory* cdm_factory,
|
| - mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request);
|
| + MojoCdmService(base::WeakPtr<MojoCdmServiceContext> context,
|
| + CdmFactory* cdm_factory);
|
|
|
| ~MojoCdmService() final;
|
|
|
| @@ -112,10 +107,8 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
|
| // living in the same process.
|
| static int next_cdm_id_;
|
|
|
| - mojo::StrongBinding<interfaces::ContentDecryptionModule> binding_;
|
| base::WeakPtr<MojoCdmServiceContext> context_;
|
|
|
| - mojo::ServiceProvider* service_provider_;
|
| CdmFactory* cdm_factory_;
|
| scoped_refptr<MediaKeys> cdm_;
|
|
|
|
|