Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

components/cdm/renderer/widevine_key_systems.cc

 // Copyright 2014 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 "components/cdm/renderer/widevine_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 42 matching lines @@
   // Here we assume that support for a container imples support for the
   // associated initialization data type. KeySystems handles validating
   // |init_data_type| x |container| pairings.
   if (supported_codecs & media::EME_CODEC_WEBM_ALL)
     info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
 #if defined(USE_PROPRIETARY_CODECS)
   if (supported_codecs & media::EME_CODEC_MP4_ALL)
     info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
+#if defined(OS_ANDROID)
+  info.persistent_state_requirement = media::EME_REQUIREMENT_NOT_ALLOWED;
+  info.distinctive_identifier_requirement = media::EME_REQUIREMENT_REQUIRED;
+  info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY;
+#elif defined(OS_CHROMEOS)
+  info.persistent_state_requirement = media::EME_REQUIREMENT_OPTIONAL;
+  // A distinctive identifier will be available if remote attestation succeeds.
+  // TODO(sandersd): Change to optional once CDM8 adds the ability to block

[ddorwin, 2015/02/17 20:56:47]

Add a bug reference.

Also, it may be helpful to explain that the goal/result in the meantime is to
support "optional" and "required" but not "not-allowed"

[sandersd (OOO until July 31), 2015/02/18 23:41:17]

Done.

+  // access to the distinctive identifier based on the configuration (not just
+  // based on the permission).
+  info.distinctive_identifier_requirement = media::EME_REQUIREMENT_REQUIRED;
+  // Persistent licenses will be available if remote attestation succeeds.
+  // TODO(sandersd): Add PERSISTENT_LICENSE once there is logic to predict if

[ddorwin, 2015/02/17 20:56:47]

Would it help to have PERSISTENT_LICENSE_WITH_AUTHORIZATION or something so that
you can make the decision in the core?

[sandersd (OOO until July 31), 2015/02/18 23:41:17]

Done.

This isn't a perfect definition, since what we really want is more like
'WITH_RA_PREDICTED', but it's close.

+  // remote attestation will succeed.
+  info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY;
+#else

[ddorwin, 2015/02/17 20:56:46]

This is Windows, Mac, Linux desktop, Cast, and every Linux-based device. We
can't answer these questions here. I think we will need to pass them to this
function. Note that there are platform-specific calls to AddWidevineWithCodecs,
which should solve this.

Also, this file/function is intended to contain platform-independent information
about the Widevine key system (as much as possible), so this code probably
shouldn't be here.

[sandersd (OOO until July 31), 2015/02/18 23:41:17]

Done.

+  info.persistent_state_requirement = media::EME_REQUIREMENT_OPTIONAL;
+  info.distinctive_identifier_requirement = media::EME_REQUIREMENT_NOT_ALLOWED;
+  info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY;
+#endif
+
 #if defined(ENABLE_PEPPER_CDMS)
   info.pepper_type = kWidevineCdmPluginMimeType;
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   concrete_key_systems->push_back(info);
 }
 
 }  // namespace cdm
 
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)