media: Enable CDM host verification in CdmModule

Desktop / Chromium - Xiaohan Wang [chromium.org] - 7 October 2017 00:56 EDT

Previously CDM host verification was only enabled when using pepper CDM. This CL also enables it when using mojo CDM.

Detailed changes:
- Update MojoMediaClient to support getting CDM host file paths.- Update CdmHostFiles to support CDM host verification with and without the CDM adapter.
- Update CdmModule to initialize CDM host verification.

Note that pre-submit script is skipped due to crbug.com/772494

NOPRESUBMIT=true BUG=730770 TEST=Enables existing browser test using mojo CDM

Change-Id: I893c4032a10d0deea52abc323b3cebc9b4174196 Reviewed-on: https://chromium-review.googlesource.com/699008

9b8800e media: Enable CDM host verification in CdmModule
.../browser/media/encrypted_media_browsertest.cc | 7 --
content/ppapi_plugin/ppapi_thread.cc | 30 ++---
content/utility/utility_service_factory.cc | 12 ++
media/cdm/cdm_host_files.cc | 139 +++++++++++----------
media/cdm/cdm_host_files.h | 54 ++++----
media/cdm/cdm_module.cc | 74 ++++++++---
media/cdm/cdm_module.h | 30 ++++-
.../cdm/ppapi/external_clear_key/clear_key_cdm.cc | 8 +-
media/mojo/services/media_service.cc | 26 +++-
media/mojo/services/media_service.h | 4 -
media/mojo/services/mojo_media_client.cc | 5 +
media/mojo/services/mojo_media_client.h | 9 ++
12 files changed, 255 insertions(+), 143 deletions(-)

Upstream: git.chromium.org


  • Share