Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

chromecast/renderer/key_systems_cast.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 "chromecast/renderer/key_systems_cast.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chromecast/media/base/key_systems_common.h"
 #include "components/cdm/renderer/widevine_key_systems.h"
 #include "media/base/eme_constants.h"
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 namespace chromecast {
 namespace shell {
 
 void AddKeySystemWithCodecs(

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

This function is insufficient. I wonder if it is even necessary or we should
just inline it at line 43.
The Cast team will need to provide the new enum values. I assume they are the
same as for Widevine.

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

Done.

     const std::string& key_system_name,
     std::vector< ::media::KeySystemInfo>* concrete_key_systems) {

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

can we remove the space before ::?

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

Done.

-  ::media::KeySystemInfo info(key_system_name);
+  ::media::KeySystemInfo info;
+  info.key_system = key_system_name;
   info.supported_codecs = ::media::EME_CODEC_MP4_ALL;

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

same as below

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

Done.

   concrete_key_systems->push_back(info);
 }
 
 void AddChromecastKeySystems(
     std::vector< ::media::KeySystemInfo>* key_systems_info) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
-  AddWidevineWithCodecs(cdm::WIDEVINE,
-                        ::media::EME_CODEC_MP4_ALL,
-                        key_systems_info);
+  AddWidevineWithCodecs(
+      cdm::WIDEVINE,
+      ::media::EME_CODEC_MP4_ALL,

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

Let's not use *_ALL (I know it was there before but let's fix it).

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

Done.

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

Done.

+      ::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.
+      key_systems_info);
 #endif
 
 #if defined(PLAYREADY_CDM_AVAILABLE)
   AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
                          key_systems_info);
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast