Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1160)

Unified Diff: media/base/key_systems.cc

Issue 1585083003: EME: Do not special case an empty robustness string. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698