Chromecast buildfix: restores AddKeySystemWithCodecs, fixes namespace.

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 7739d7240a6ed49f91bd6937e1c13d4060ba0472..246d6adef805ee9601a7ef79649b5ba2b6db0773 100644
--- a/chromecast/renderer/key_systems_cast.cc
+++ b/chromecast/renderer/key_systems_cast.cc
@@ -17,6 +17,22 @@
 namespace chromecast {
 namespace shell {
 
+void AddKeySystemWithCodecs(

[lcwu1, 2015/02/23 19:18:29]

Also we might want to add a TODO here to change this signature of this function
to specify the new info being set in this function.

[gunsch, 2015/02/23 19:30:54]

Are we expecting to have to set this differently for different CDMs?

+    const std::string& key_system_name,
+    std::vector<::media::KeySystemInfo>* key_systems_info) {
+  ::media::KeySystemInfo info;
+  info.key_system = key_system_name;
+  info.supported_codecs =
+      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
+  info.supported_init_data_types = ::media::EME_INIT_DATA_TYPE_CENC;
+  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_ENABLED;
+  info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
+  key_systems_info->push_back(info);
+}
+
 void AddChromecastKeySystems(
     std::vector<::media::KeySystemInfo>* key_systems_info) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
@@ -31,17 +47,8 @@ void AddChromecastKeySystems(
 #endif
 
 #if defined(PLAYREADY_CDM_AVAILABLE)
-  ::media::KeySystemInfo info;
-  info.key_system = ::media::kChromecastPlayreadyKeySystem;
-  info.supported_codecs =
-      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
-  info.supported_init_data_types = ::media::EME_INIT_DATA_TYPE_CENC;
-  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_ENABLED;
-  info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
-  key_systems_info->push_back(info);
+  AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
+                         key_systems_info);
 #endif
 }