Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

chrome/renderer/media/chrome_key_systems.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 "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 54 matching lines @@
       "application/x-ppapi-clearkey-cdm";
 
   std::vector<base::string16> additional_param_names;
   std::vector<base::string16> additional_param_values;
   if (!IsPepperCdmAvailable(kExternalClearKeyPepperType,
                             &additional_param_names,
                             &additional_param_values)) {
     return;
   }
 
-  KeySystemInfo info(kExternalClearKeyKeySystem);
+  KeySystemInfo info;
+  info.key_system = kExternalClearKeyKeySystem;
 
   info.supported_codecs = media::EME_CODEC_WEBM_ALL;
   info.supported_init_data_types = media::EME_INIT_DATA_TYPE_WEBM;
 #if defined(USE_PROPRIETARY_CODECS)
   info.supported_codecs |= media::EME_CODEC_MP4_ALL;
   info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
+  // Persistent sessions are faked.
+  info.persistent_license_support = media::EME_SESSION_TYPE_SUPPORTED;
+  info.persistent_release_message_support =
+      media::EME_SESSION_TYPE_NOT_SUPPORTED;
+  info.persistent_state_support = media::EME_FEATURE_SUPPORTED;
+  info.distinctive_identifier_support = media::EME_FEATURE_NOT_SUPPORTED;
+
   info.pepper_type = kExternalClearKeyPepperType;
 
   concrete_key_systems->push_back(info);
 
   // Add support of decrypt-only mode in ClearKeyCdm.
   info.key_system = kExternalClearKeyDecryptOnlyKeySystem;
   concrete_key_systems->push_back(info);
 
   // A key system that triggers FileIO test in ClearKeyCdm.
   info.key_system = kExternalClearKeyFileIOTestKeySystem;
@@ skipping 77 matching lines @@
     if (codecs[i] == kCdmSupportedCodecVp8)
       supported_codecs |= media::EME_CODEC_WEBM_VP8;
     if (codecs[i] == kCdmSupportedCodecVp9)
       supported_codecs |= media::EME_CODEC_WEBM_VP9;
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAvc1)
       supported_codecs |= media::EME_CODEC_MP4_AVC1;
 #endif  // defined(USE_PROPRIETARY_CODECS)
   }
 
-  cdm::AddWidevineWithCodecs(cdm::WIDEVINE,
-                             supported_codecs,
-                             concrete_key_systems);
+  cdm::AddWidevineWithCodecs(
+      cdm::WIDEVINE,
+      supported_codecs,
+#if defined(OS_CHROMEOS)
+      // Persistent licenses are supported if remote attestatin succeeds.

[ddorwin, 2015/02/19 01:41:33]

attestation

[sandersd (OOO until July 31), 2015/02/19 21:08:33]

Done.

+      media::EME_SESSION_TYPE_SUPPORTED_WITH_PERMISSION,
+      media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
+      media::EME_FEATURE_SUPPORTED,           // Persistent state.
+      // A distinctive identifier will be available if remote attestation
+      // succeeds.
+      // TODO(sandersd): Using ALWAYS_AVAILABLE prevents "not-allowed" from
+      // succeeding. Change this to SUPPORTED_WITH_PERMISSION once the
+      // distinctive identifier can be blocked. http://crbug.com/457482
+      media::EME_FEATURE_ALWAYS_AVAILABLE,
+#else   // (Desktop)
+      media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
+      media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
+      media::EME_FEATURE_SUPPORTED,           // Persistent state.
+      media::EME_FEATURE_NOT_SUPPORTED,       // Distinctive identifier.
+#endif  // defined(OS_CHROMEOS)
+      concrete_key_systems);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
 #if defined(ENABLE_PEPPER_CDMS)
   AddExternalClearKey(key_systems_info);
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   AddPepperBasedWidevine(key_systems_info);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
   cdm::AddAndroidWidevine(key_systems_info);
 #endif  // defined(OS_ANDROID)
 }