Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2574)

Unified Diff: content/renderer/media/render_media_client_unittest.cc

Issue 923283002: Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove Blink dependency again. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.cc ('k') | media/base/eme_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/render_media_client_unittest.cc
diff --git a/content/renderer/media/render_media_client_unittest.cc b/content/renderer/media/render_media_client_unittest.cc
index e796e46442312caae44d0098879db8035c26b0c1..2366156bd39643c9fcaa96dbd8d233bb822d0faf 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
}
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.cc ('k') | media/base/eme_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698