Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

media/base/key_systems_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "media/base/eme_constants.h"
 #include "media/base/key_system_info.h"
@@ skipping 142 matching lines @@
 void TestMediaClient::SetKeySystemsUpdateNeeded() {
   is_update_needed_ = true;
 }
 
 void TestMediaClient::DisableExternalKeySystemSupport() {
   supports_external_key_system_ = false;
 }
 
 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";
 #endif  // defined(ENABLE_PEPPER_CDMS)
   key_systems->push_back(ext);
 }
 
 // TODO(sandersd): Refactor. http://crbug.com/417444
 class KeySystemsTest : public testing::Test {
  protected:
@@ skipping 585 matching lines @@
 
   EXPECT_TRUE(IsSupportedKeySystem(kUsesAes));
   EXPECT_TRUE(PrefixedIsSupportedKeySystemWithMediaMimeType(
       kVideoWebM, no_codecs(), kUsesAes));
   EXPECT_FALSE(IsSupportedKeySystem(kExternal));
   EXPECT_FALSE(PrefixedIsSupportedKeySystemWithMediaMimeType(
       kVideoWebM, no_codecs(), kExternal));
 }
 
 }  // namespace media