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

Unified Diff: media/base/key_systems_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 | « media/base/key_systems.cc ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems_unittest.cc
diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc
index bbd5989e6717b4df7275384b7836f5883bb2703c..03a16cf704e84873b272b164c13ad5eae5cc8ac4 100644
--- a/media/base/key_systems_unittest.cc
+++ b/media/base/key_systems_unittest.cc
@@ -160,20 +160,30 @@ void TestMediaClient::DisableExternalKeySystemSupport() {
void TestMediaClient::AddUsesAesKeySystem(
std::vector<KeySystemInfo>* key_systems) {
- KeySystemInfo aes(kUsesAes);
+ KeySystemInfo aes;
+ aes.key_system = kUsesAes;
aes.supported_codecs = EME_CODEC_WEBM_ALL;
aes.supported_codecs |= TEST_CODEC_FOO_ALL;
aes.supported_init_data_types = EME_INIT_DATA_TYPE_WEBM;
+ aes.persistent_license_support = EME_SESSION_TYPE_NOT_SUPPORTED;
+ aes.persistent_release_message_support = EME_SESSION_TYPE_NOT_SUPPORTED;
+ aes.persistent_state_support = EME_FEATURE_NOT_SUPPORTED;
+ aes.distinctive_identifier_support = EME_FEATURE_NOT_SUPPORTED;
aes.use_aes_decryptor = true;
key_systems->push_back(aes);
}
void TestMediaClient::AddExternalKeySystem(
std::vector<KeySystemInfo>* key_systems) {
- KeySystemInfo ext(kExternal);
+ KeySystemInfo ext;
+ ext.key_system = kExternal;
ext.supported_codecs = EME_CODEC_WEBM_ALL;
ext.supported_codecs |= TEST_CODEC_FOO_ALL;
ext.supported_init_data_types = EME_INIT_DATA_TYPE_WEBM;
+ ext.persistent_license_support = EME_SESSION_TYPE_SUPPORTED;
+ ext.persistent_release_message_support = EME_SESSION_TYPE_NOT_SUPPORTED;
+ ext.persistent_state_support = EME_FEATURE_ALWAYS_ENABLED;
+ ext.distinctive_identifier_support = EME_FEATURE_ALWAYS_ENABLED;
ext.parent_key_system = kExternalParent;
#if defined(ENABLE_PEPPER_CDMS)
ext.pepper_type = "application/x-ppapi-external-cdm";
« no previous file with comments | « media/base/key_systems.cc ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698