| Index: media/base/key_systems.cc
|
| diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
|
| index 744ae2d3c028efc66f1b62d459a915bcf251465a..78a1904609733808d5c3db979646f899bfd61165 100644
|
| --- a/media/base/key_systems.cc
|
| +++ b/media/base/key_systems.cc
|
| @@ -754,8 +754,6 @@ EmeConfigRule KeySystemsImpl::GetRobustnessConfigRule(
|
| EmeRobustness robustness = ConvertRobustness(requested_robustness);
|
| if (robustness == EmeRobustness::INVALID)
|
| return EmeConfigRule::NOT_SUPPORTED;
|
| - if (robustness == EmeRobustness::EMPTY)
|
| - return EmeConfigRule::SUPPORTED;
|
|
|
| KeySystemInfoMap::const_iterator key_system_iter =
|
| concrete_key_system_map_.find(key_system);
|
| @@ -787,6 +785,11 @@ EmeConfigRule KeySystemsImpl::GetRobustnessConfigRule(
|
|
|
| if (key_system == kWidevineKeySystem) {
|
| #if defined(OS_CHROMEOS)
|
| + // TODO(ddorwin): Remove this once we have confirmed it is not necessary.
|
| + // See https://crbug.com/482277
|
| + if (robustness == EmeRobustness::EMPTY)
|
| + return EmeConfigRule::SUPPORTED;
|
| +
|
| // Hardware security requires remote attestation.
|
| if (robustness >= EmeRobustness::HW_SECURE_CRYPTO)
|
| return EmeConfigRule::IDENTIFIER_REQUIRED;
|
|
|