Convert Widevine and Android platform key systems to KeySystemProperties

chromecast/renderer/key_systems_cast.cc

Index: chromecast/renderer/key_systems_cast.cc
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc
index c1257fdba8c3a040b09dc137c5c4d4d70c70ea49..76a3f1509712145c6885bba4612469d09b56c34e 100644
--- a/chromecast/renderer/key_systems_cast.cc
+++ b/chromecast/renderer/key_systems_cast.cc
@@ -10,11 +10,9 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chromecast/media/base/key_systems_common.h"
-#include "components/cdm/renderer/widevine_key_systems.h"
+#include "components/cdm/renderer/widevine_key_system_properties.h"
 #include "media/base/eme_constants.h"
 
-#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
-
 using ::media::EmeFeatureSupport;
 using ::media::EmeRobustness;
 using ::media::EmeSessionTypeSupport;
@@ -48,26 +46,30 @@ void AddKeySystemWithCodecs(
 }
 
 void AddChromecastKeySystems(
-    std::vector<::media::KeySystemInfo>* key_systems_info) {
+    std::vector<std::unique_ptr<::media::KeySystemProperties>>*
+        key_systems_properties) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
   ::media::SupportedCodecs codecs =
       ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
       ::media::EME_CODEC_WEBM_VP8 | ::media::EME_CODEC_WEBM_VP9;
-  cdm::AddWidevineWithCodecs(
-      codecs,                                // Regular codecs.
+  key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
+      codecs,  // Regular codecs.
 #if defined(OS_ANDROID)
-      codecs,                                // Hardware-secure codecs.
-#endif  // defined(OS_ANDROID)
-      EmeRobustness::HW_SECURE_ALL,          // Max audio robustness.
-      EmeRobustness::HW_SECURE_ALL,          // Max video robustness.
-      EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
-      EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
+      codecs,  // Hardware-secure codecs.
+#endif
+      ::media::EmeRobustness::HW_SECURE_ALL,          // Max audio robustness.

[xhwang, 2016/04/27 19:28:39]

OOC, how did this work before without ::media::?

[halliwell, 2016/04/27 22:20:13]

Oh, there are some using statements at the top.  I think the ::media got
introduced here because I initially put this code directly into the content
client code, then I moved it back here.  I removed the ::media now to take
advantage of the existing using statements.

+      ::media::EmeRobustness::HW_SECURE_ALL,          // Max video robustness.
+      ::media::EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
+      ::media::EmeSessionTypeSupport::
+          NOT_SUPPORTED,  // persistent-release-message.
       // Note: On Chromecast, all CDMs may have persistent state.
-      EmeFeatureSupport::ALWAYS_ENABLED,     // Persistent state.
-      EmeFeatureSupport::ALWAYS_ENABLED,     // Distinctive identifier.
-      key_systems_info);
+      ::media::EmeFeatureSupport::ALWAYS_ENABLED,    // Persistent state.
+      ::media::EmeFeatureSupport::ALWAYS_ENABLED));  // Distinctive identifier.
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
+}
 
+void AddChromecastKeySystemsInfo(
+    std::vector<::media::KeySystemInfo>* key_systems_info) {
 #if defined(PLAYREADY_CDM_AVAILABLE)
   AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
                          key_systems_info);