Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

components/cdm/renderer/android_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/android_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 25 matching lines @@
   return response;
 }
 
 void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemResponse response = QueryKeySystemSupport(
       kWidevineKeySystem);
   if (response.compositing_codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(
         WIDEVINE,
         static_cast<SupportedCodecs>(response.compositing_codecs),
+        media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
+        media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
+        media::EME_FEATURE_NOT_SUPPORTED,       // Persistent state.
+        media::EME_FEATURE_ALWAYS_AVAILABLE,    // Distinctive identifier.
         concrete_key_systems);
   }
 
   if (response.non_compositing_codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(

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

TODO: Remove with unprefixed. crbug.com/249976

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

Done.

         WIDEVINE_HR_NON_COMPOSITING,

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

We need to not support this in unprefixed. We might need to explicitly filter
somewhere.
Alternatively, this might be some property that we set. You can reference
394926.

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

Isn't this what IsKnownKeySystem() does?

         static_cast<SupportedCodecs>(response.non_compositing_codecs),
+        media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
+        media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
+        media::EME_FEATURE_NOT_SUPPORTED,       // Persistent state.
+        media::EME_FEATURE_ALWAYS_AVAILABLE,    // Distinctive identifier.
         concrete_key_systems);
   }
 }
 
 void AddAndroidPlatformKeySystems(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   std::vector<std::string> key_system_names;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_GetPlatformKeySystemNames(&key_system_names));
 
   for (std::vector<std::string>::const_iterator it = key_system_names.begin();
        it != key_system_names.end(); ++it) {
     SupportedKeySystemResponse response = QueryKeySystemSupport(*it);
     if (response.compositing_codecs != media::EME_CODEC_NONE) {
-      KeySystemInfo info(*it);
+      KeySystemInfo info;
+      info.key_system = *it;
       info.supported_codecs = response.compositing_codecs;
       // Here we assume that support for a container implies support for the
       // associated initialization data type. KeySystems handles validating
       // |init_data_type| x |container| pairings.
       if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL)
         info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
 #if defined(USE_PROPRIETARY_CODECS)
       if (response.compositing_codecs & media::EME_CODEC_MP4_ALL)
         info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
 #endif  // defined(USE_PROPRIETARY_CODECS)
+      // Assume the worst.
+      info.persistent_license_support = media::EME_SESSION_TYPE_NOT_SUPPORTED;
+      info.persistent_release_message_support =
+          media::EME_SESSION_TYPE_NOT_SUPPORTED;
+      info.persistent_state_support = media::EME_FEATURE_ALWAYS_AVAILABLE;

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

You might mention that this is the worst case for the user (even thought it
might be a false positive for the app).

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

Done.

+      info.distinctive_identifier_support = media::EME_FEATURE_ALWAYS_AVAILABLE;
       concrete_key_systems->push_back(info);
     }
   }
 }
 
 }  // namespace cdm