| Index: media/mojo/services/mojo_renderer_service.h
|
| diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
|
| index 21a1fc45d14d8cd3e4d19b409f26cb4de85b6f94..efa8f01c70fd1f1a61ffe015b89e0c2788bfcf7e 100644
|
| --- a/media/mojo/services/mojo_renderer_service.h
|
| +++ b/media/mojo/services/mojo_renderer_service.h
|
| @@ -12,11 +12,6 @@
|
| #include "media/base/buffering_state.h"
|
| #include "media/base/pipeline_status.h"
|
| #include "media/mojo/interfaces/renderer.mojom.h"
|
| -#include "mojo/public/cpp/bindings/strong_binding.h"
|
| -
|
| -namespace mojo {
|
| -class ApplicationConnection;
|
| -}
|
|
|
| namespace media {
|
|
|
| @@ -26,13 +21,12 @@ class Renderer;
|
|
|
| // A interfaces::Renderer implementation that uses media::AudioRenderer to
|
| // decode and render audio to a sink obtained from the ApplicationConnection.
|
| -class MojoRendererService : interfaces::Renderer {
|
| +class MojoRendererService : public interfaces::Renderer {
|
| public:
|
| // |cdm_context_provider| can be used to find the CdmContext to support
|
| // encrypted media. If null, encrypted media is not supported.
|
| MojoRendererService(base::WeakPtr<CdmContextProvider> cdm_context_provider,
|
| - scoped_ptr<media::Renderer> renderer,
|
| - mojo::InterfaceRequest<interfaces::Renderer> request);
|
| + scoped_ptr<media::Renderer> renderer);
|
| ~MojoRendererService() final;
|
|
|
| // interfaces::Renderer implementation.
|
| @@ -89,8 +83,6 @@ class MojoRendererService : interfaces::Renderer {
|
| // Callback executed once SetCdm() completes.
|
| void OnCdmAttached(const mojo::Callback<void(bool)>& callback, bool success);
|
|
|
| - mojo::StrongBinding<interfaces::Renderer> binding_;
|
| -
|
| base::WeakPtr<CdmContextProvider> cdm_context_provider_;
|
| scoped_ptr<media::Renderer> renderer_;
|
|
|
|
|