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

Unified Diff: media/blink/key_system_config_selector.cc

Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
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 29fe49288c50ef1e3352ce6347c3c2b33449e440..778f2b4fb284106d34b1c70e53fa11a5a467dad9 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -347,8 +347,10 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
if (!base::IsStringASCII(capability.mimeType) ||
!base::IsStringASCII(capability.codecs) ||
!IsSupportedContentType(key_system, media_type,
- base::UTF16ToASCII(capability.mimeType),
- base::UTF16ToASCII(capability.codecs),
+ base::UTF16ToASCII(
+ base::StringPiece16(capability.mimeType)),
+ base::UTF16ToASCII(
+ base::StringPiece16(capability.codecs)),
&proposed_config_state)) {
continue;
}
@@ -360,7 +362,8 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
if (!base::IsStringASCII(capability.robustness))
continue;
EmeConfigRule robustness_rule = key_systems_->GetRobustnessConfigRule(
- key_system, media_type, base::UTF16ToASCII(capability.robustness));
+ key_system, media_type, base::UTF16ToASCII(
+ base::StringPiece16(capability.robustness)));
if (!proposed_config_state.IsRuleSupported(robustness_rule))
continue;
proposed_config_state.AddRule(robustness_rule);
@@ -688,7 +691,8 @@ void KeySystemConfigSelector::SelectConfig(
return;
}
- std::string key_system_ascii = base::UTF16ToASCII(key_system);
+ std::string key_system_ascii =
+ base::UTF16ToASCII(base::StringPiece16(key_system));
if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) {
not_supported_cb.Run("Unsupported keySystem");
return;
« no previous file with comments | « media/blink/encrypted_media_player_support.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698