diff options
| author | sandersd <sandersd@chromium.org> | 2015-02-19 22:08:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 06:08:43 +0000 |
| commit | f629e579c00a93751c75883d48c600d3df4d1ed6 (patch) | |
| tree | 329beac97727e472bae498486f0207e6864be59f /content | |
| parent | 501da0af4e357859485bab20f37dec6d8dc34d18 (diff) | |
| download | chromium_src-f629e579c00a93751c75883d48c600d3df4d1ed6.zip chromium_src-f629e579c00a93751c75883d48c600d3df4d1ed6.tar.gz chromium_src-f629e579c00a93751c75883d48c600d3df4d1ed6.tar.bz2 | |
Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().
Also includes additional metadata in KeySystemInfo to support those checks.
BUG=4484922
Review URL: https://codereview.chromium.org/923283002
Cr-Commit-Position: refs/heads/master@{#317257}
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/render_media_client_unittest.cc | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/content/renderer/media/render_media_client_unittest.cc b/content/renderer/media/render_media_client_unittest.cc index e796e46..2366156 100644 --- a/content/renderer/media/render_media_client_unittest.cc +++ b/content/renderer/media/render_media_client_unittest.cc @@ -24,10 +24,32 @@ class TestContentRendererClient : public ContentRendererClient { // ContentRendererClient implementation. void AddKeySystems( std::vector<media::KeySystemInfo>* key_systems_info) override { - media::KeySystemInfo key_system_info("test.keysystem"); + // TODO(sandersd): Was this supposed to be added to the list? + media::KeySystemInfo key_system_info; + key_system_info.key_system = "test.keysystem"; + key_system_info.persistent_license_support = + media::EME_SESSION_TYPE_NOT_SUPPORTED; + key_system_info.persistent_release_message_support = + media::EME_SESSION_TYPE_NOT_SUPPORTED; + key_system_info.persistent_state_support = + media::EME_FEATURE_NOT_SUPPORTED; + key_system_info.distinctive_identifier_support = + media::EME_FEATURE_NOT_SUPPORTED; + key_systems_info->push_back(key_system_info); #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) - if (is_extra_key_system_enabled_) - key_systems_info->push_back(media::KeySystemInfo(kWidevineKeySystem)); + if (is_extra_key_system_enabled_) { + media::KeySystemInfo wv_key_system_info; + wv_key_system_info.key_system = kWidevineKeySystem; + wv_key_system_info.persistent_license_support = + media::EME_SESSION_TYPE_NOT_SUPPORTED; + wv_key_system_info.persistent_release_message_support = + media::EME_SESSION_TYPE_NOT_SUPPORTED; + wv_key_system_info.persistent_state_support = + media::EME_FEATURE_NOT_SUPPORTED; + wv_key_system_info.distinctive_identifier_support = + media::EME_FEATURE_NOT_SUPPORTED; + key_systems_info->push_back(wv_key_system_info); + } #endif } |