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

Unified Diff: media/blink/key_system_config_selector.cc

Issue 2584893002: Use explicit WebString <-> string16 conversion methods in media files (Closed)
Patch Set: . Created 4 years 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
Index: media/blink/key_system_config_selector.cc
diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
index a4f2b27b05dccd6ce2931161b4a2eb20eb9a0c39..1da8ca03ee5cf9b52f50840129b22d2be9a2d975 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -400,8 +400,8 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
// 3.4-3.11. (Implemented by IsSupportedContentType().)
ConfigState proposed_config_state = *config_state;
- if (!base::IsStringASCII(capability.mimeType) ||
- !base::IsStringASCII(capability.codecs) ||
+ if (!capability.mimeType.containsOnlyASCII() ||
+ !capability.codecs.containsOnlyASCII() ||
!IsSupportedContentType(
key_system, media_type, capability.mimeType.ascii(),
capability.codecs.ascii(), &proposed_config_state)) {
@@ -412,7 +412,7 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
// 3.12.1. If robustness is an unrecognized value or not supported by
// implementation, continue to the next iteration. String
// comparison is case-sensitive.
- if (!base::IsStringASCII(capability.robustness))
+ if (!capability.robustness.containsOnlyASCII())
continue;
EmeConfigRule robustness_rule = key_systems_->GetRobustnessConfigRule(
key_system, media_type, capability.robustness.ascii());

Powered by Google App Engine
This is Rietveld 408576698