Allow hw secured codecs on chromecast

components/cdm/renderer/widevine_key_system_properties.h

Index: components/cdm/renderer/widevine_key_system_properties.h
diff --git a/components/cdm/renderer/widevine_key_system_properties.h b/components/cdm/renderer/widevine_key_system_properties.h
index c936c62730d09fcb1b28900eb1434ca887534bc5..d096b8645e0c43e7249cbc0080b418fdb8c531f5 100644
--- a/components/cdm/renderer/widevine_key_system_properties.h
+++ b/components/cdm/renderer/widevine_key_system_properties.h
@@ -7,6 +7,7 @@
 
 #include "build/build_config.h"
 #include "media/base/key_system_properties.h"
+#include "media/media_features.h"
 
 namespace cdm {
 
@@ -15,9 +16,9 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
  public:
   WidevineKeySystemProperties(
       media::SupportedCodecs supported_codecs,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
       media::SupportedCodecs supported_secure_codecs,

[ddorwin, 2016/05/24 23:11:50]

As noted elsewhere, this was an Android specific thing. We don't use it on all
platforms that have secure codecs. Now that we have moved away from the Info
object, we might want to move to a different mechanism of providing
codec-robustness pairs.

For now, though, the build flag naming is misleading.

[yucliu1, 2016/05/25 00:43:21]

Is the *secure_codecs* here the same as *hw_secure_codecs*? If so, I think the
concept should be valid for all platforms supporting hw secured codecs.

[ddorwin, 2016/05/27 21:33:00]

I believe (on Android) `supported_secure_codecs` is the set of video codecs that
will be available if you set `use_hw_secure_codecs`. The fact that the
robustness affects the available codecs is currently unique to Android and
something we ignore on all other platforms (e.g. Chrome OS). If we want to
generalize this, we should do that as a separate CL and figure out what that
means.

xhwang and I will discuss offline next week.

-#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,
@@ -30,9 +31,9 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
       media::EmeInitDataType init_data_type) const override;
 
   media::SupportedCodecs GetSupportedCodecs() const override;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   media::SupportedCodecs GetSupportedSecureCodecs() const override;
-#endif
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
 
   media::EmeConfigRule GetRobustnessConfigRule(
       media::EmeMediaType media_type,
@@ -50,9 +51,9 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
 
  private:
   const media::SupportedCodecs supported_codecs_;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   const media::SupportedCodecs supported_secure_codecs_;
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
   const media::EmeRobustness max_audio_robustness_;
   const media::EmeRobustness max_video_robustness_;
   const media::EmeSessionTypeSupport persistent_license_support_;