Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.
commitd7411976f6467bf4519f66f32b4459717e7352d7
authorsandersd <sandersd@chromium.org>
Fri, 15 May 2015 04:21:57 +0000 (14 21:21 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 15 May 2015 04:22:14 +0000 (15 04:22 +0000)
treec7d1fc7a2e2254e20c9f9af1695a0c77fba552d0
parent55c065b684f16cee1c73e7ef803764f22a4fb281
Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

This completes the path from the secure surface preference, through requestMediaKeySystemAccess() and finally to CDM creation on Android where secure codecs are enabled. With this change, configs requiring secure codes are rejected without the preference and the CDM is only configures to use hardware-secure codecs if the config requires it.

There is a separate bug (http://crbug.com/478185) for implementing similar plumbing for the use of secure surfaces.

BUG=467779

Committed: https://crrev.com/9ce0a551c7f1d79dea793b5691473ef9d5fb9326
Cr-Commit-Position: refs/heads/master@{#330008}

Review URL: https://codereview.chromium.org/1131753003

Cr-Commit-Position: refs/heads/master@{#330040}
35 files changed:
chromecast/browser/media/cast_browser_cdm_factory.cc
chromecast/browser/media/cast_browser_cdm_factory.h
content/browser/media/cdm/browser_cdm_manager.cc
content/browser/media/cdm/browser_cdm_manager.h
content/common/media/cdm_messages.h
content/renderer/media/crypto/ppapi_decryptor.cc
content/renderer/media/crypto/ppapi_decryptor.h
content/renderer/media/crypto/proxy_media_keys.cc
content/renderer/media/crypto/proxy_media_keys.h
content/renderer/media/crypto/render_cdm_factory.cc
content/renderer/media/crypto/render_cdm_factory.h
content/renderer/media/crypto/renderer_cdm_manager.cc
content/renderer/media/crypto/renderer_cdm_manager.h
media/base/android/browser_cdm_factory_android.cc
media/base/android/browser_cdm_factory_android.h
media/base/browser_cdm_factory.cc
media/base/browser_cdm_factory.h
media/base/cdm_config.h [new file with mode: 0644]
media/base/cdm_factory.h
media/base/eme_constants.h
media/base/key_systems.cc
media/blink/cdm_session_adapter.cc
media/blink/cdm_session_adapter.h
media/blink/key_system_config_selector.cc
media/blink/key_system_config_selector.h
media/blink/key_system_config_selector_unittest.cc
media/blink/webcontentdecryptionmodule_impl.cc
media/blink/webcontentdecryptionmodule_impl.h
media/blink/webcontentdecryptionmoduleaccess_impl.cc
media/blink/webcontentdecryptionmoduleaccess_impl.h
media/blink/webencryptedmediaclient_impl.cc
media/blink/webencryptedmediaclient_impl.h
media/cdm/default_cdm_factory.cc
media/cdm/default_cdm_factory.h
media/cdm/proxy_decryptor.cc