Allow hw secured codecs on chromecast

components/cdm/renderer/widevine_key_system_properties.cc

Index: components/cdm/renderer/widevine_key_system_properties.cc
diff --git a/components/cdm/renderer/widevine_key_system_properties.cc b/components/cdm/renderer/widevine_key_system_properties.cc
index 3a6eab49728cccf389de14289f54018587bc848d..836ccd064626b40e946e6248168a5b6d3ea695fc 100644
--- a/components/cdm/renderer/widevine_key_system_properties.cc
+++ b/components/cdm/renderer/widevine_key_system_properties.cc
@@ -39,9 +39,9 @@ EmeRobustness ConvertRobustness(const std::string& robustness) {
 
 WidevineKeySystemProperties::WidevineKeySystemProperties(
     media::SupportedCodecs supported_codecs,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
     media::SupportedCodecs supported_secure_codecs,
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
     media::EmeRobustness max_audio_robustness,
     media::EmeRobustness max_video_robustness,
     media::EmeSessionTypeSupport persistent_license_support,
@@ -49,9 +49,9 @@ WidevineKeySystemProperties::WidevineKeySystemProperties(
     media::EmeFeatureSupport persistent_state_support,
     media::EmeFeatureSupport distinctive_identifier_support)
     : supported_codecs_(supported_codecs),
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       supported_secure_codecs_(supported_secure_codecs),
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       max_audio_robustness_(max_audio_robustness),
       max_video_robustness_(max_video_robustness),
       persistent_license_support_(persistent_license_support),
@@ -83,11 +83,11 @@ SupportedCodecs WidevineKeySystemProperties::GetSupportedCodecs() const {
   return supported_codecs_;
 }
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 SupportedCodecs WidevineKeySystemProperties::GetSupportedSecureCodecs() const {
   return supported_secure_codecs_;
 }
-#endif
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 
 EmeConfigRule WidevineKeySystemProperties::GetRobustnessConfigRule(
     EmeMediaType media_type,
@@ -135,7 +135,7 @@ EmeConfigRule WidevineKeySystemProperties::GetRobustnessConfigRule(
       max_robustness == EmeRobustness::HW_SECURE_ALL) {
     return EmeConfigRule::IDENTIFIER_RECOMMENDED;
   }
-#elif defined(OS_ANDROID)
+#elif BUILDFLAG(ENABLE_HW_SECURE_CODEC)

[jrummell, 2016/05/24 18:27:50]

Should this be it's own #if (so #endif // OS_CHROMEOS, #if
ENABLE_HW_SECURE_CODEC)? I don't see any restriction that CrOS can't use secure
codecs in the future. 

[yucliu1, 2016/05/24 21:22:36]

Done.

   // Require hardware secure codecs when SW_SECURE_DECODE or above is specified.
   if (robustness >= EmeRobustness::SW_SECURE_DECODE) {
     return EmeConfigRule::HW_SECURE_CODECS_REQUIRED;