| Index: media/gpu/android_video_decode_accelerator.h
|
| diff --git a/media/gpu/android_video_decode_accelerator.h b/media/gpu/android_video_decode_accelerator.h
|
| index 71fe528e1a2bc903372e343dc6e2914ee7154095..74d1b27a29f9f51701bbb5ba105394e9698f2e6e 100644
|
| --- a/media/gpu/android_video_decode_accelerator.h
|
| +++ b/media/gpu/android_video_decode_accelerator.h
|
| @@ -20,7 +20,7 @@
|
| #include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "media/base/android/media_drm_bridge_cdm_context.h"
|
| #include "media/base/android/sdk_media_codec_bridge.h"
|
| -#include "media/base/media_keys.h"
|
| +#include "media/base/content_decryption_module.h"
|
| #include "media/gpu/avda_codec_allocator.h"
|
| #include "media/gpu/avda_picture_buffer_manager.h"
|
| #include "media/gpu/avda_state_provider.h"
|
| @@ -284,7 +284,7 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
|
| base::Optional<DrainType> drain_type_;
|
|
|
| // Holds a ref-count to the CDM to avoid using the CDM after it's destroyed.
|
| - scoped_refptr<MediaKeys> cdm_for_reference_holding_only_;
|
| + scoped_refptr<ContentDecryptionModule> cdm_for_reference_holding_only_;
|
|
|
| MediaDrmBridgeCdmContext* media_drm_bridge_cdm_context_;
|
|
|
|
|