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 47b7103b0443f54dc4e7793941775615461683ce..9399da850649fd7f00274a488aa0b75919b422ce 100644 |
--- a/components/cdm/renderer/widevine_key_system_properties.cc |
+++ b/components/cdm/renderer/widevine_key_system_properties.cc |
@@ -119,16 +119,12 @@ EmeConfigRule WidevineKeySystemProperties::GetRobustnessConfigRule( |
} |
#if defined(OS_CHROMEOS) |
- // TODO(ddorwin): Remove this once we have confirmed it is not necessary. |
- // See https://crbug.com/482277 |
- if (robustness == Robustness::EMPTY) |
- return EmeConfigRule::SUPPORTED; |
- |
// Hardware security requires remote attestation. |
if (robustness >= Robustness::HW_SECURE_CRYPTO) |
return EmeConfigRule::IDENTIFIER_REQUIRED; |
// For video, recommend remote attestation if HW_SECURE_ALL is available, |
+ // regardless of the value of |robustness|, even when it's Robustness::EMPTY, |
ddorwin
2016/11/18 23:50:07
EMPTY is not supposed to be special, so there is n
xhwang
2016/11/21 18:13:46
Done.
|
// because it enables hardware accelerated decoding. |
// TODO(sandersd): Only do this when hardware accelerated decoding is |
// available for the requested codecs. |