| Index: media/gpu/android_video_decode_accelerator.cc
|
| diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
|
| index 90e1abdfdcd03e368b5d715c2d7cd61d083223ea..8c3e66f30a0f42ce5b1492b67b6a649d5f738c9a 100644
|
| --- a/media/gpu/android_video_decode_accelerator.cc
|
| +++ b/media/gpu/android_video_decode_accelerator.cc
|
| @@ -34,7 +34,6 @@
|
| #include "media/base/media.h"
|
| #include "media/base/timestamp_constants.h"
|
| #include "media/base/video_decoder_config.h"
|
| -#include "media/cdm/cdm_manager.h"
|
| #include "media/gpu/android_video_surface_chooser_impl.h"
|
| #include "media/gpu/avda_picture_buffer_manager.h"
|
| #include "media/gpu/content_video_view_overlay.h"
|
| @@ -44,6 +43,10 @@
|
| #include "ui/gl/android/surface_texture.h"
|
| #include "ui/gl/gl_bindings.h"
|
|
|
| +#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| +#include "media/cdm/cdm_manager.h" // nogncheck
|
| +#endif
|
| +
|
| #define NOTIFY_ERROR(error_code, error_message) \
|
| do { \
|
| DLOG(ERROR) << error_message; \
|
|
|