| Index: media/blink/webmediaplayer_params.h
|
| diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
|
| index 3efd40b039a990ee50e6888b3fd2ae23c781e3d9..4946382530e4d0abbed7cab1ed5d756c47c12673 100644
|
| --- a/media/blink/webmediaplayer_params.h
|
| +++ b/media/blink/webmediaplayer_params.h
|
| @@ -27,7 +27,6 @@ namespace media {
|
|
|
| class RestartableAudioRendererSink;
|
| class MediaLog;
|
| -class MediaPermission;
|
| class SurfaceManager;
|
|
|
| // Holds parameters for constructing WebMediaPlayerImpl without having
|
| @@ -55,7 +54,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
| const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
|
| const Context3DCB& context_3d,
|
| const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
|
| - MediaPermission* media_permission,
|
| blink::WebContentDecryptionModule* initial_cdm,
|
| SurfaceManager* surface_manager);
|
|
|
| @@ -87,8 +85,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
|
|
| Context3DCB context_3d_cb() const { return context_3d_cb_; }
|
|
|
| - MediaPermission* media_permission() const { return media_permission_; }
|
| -
|
| blink::WebContentDecryptionModule* initial_cdm() const {
|
| return initial_cdm_;
|
| }
|
| @@ -109,8 +105,6 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
|
| Context3DCB context_3d_cb_;
|
| AdjustAllocatedMemoryCB adjust_allocated_memory_cb_;
|
|
|
| - // TODO(xhwang): Remove after prefixed EME API support is removed.
|
| - MediaPermission* media_permission_;
|
| blink::WebContentDecryptionModule* initial_cdm_;
|
| SurfaceManager* surface_manager_;
|
|
|
|
|