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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cert/x509_cert_types_mac.cc

Issue 266053002: Implement alternative string conversion functions in net/ on Android, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« net/base/net_string_util.h ('K') | « net/base/net_string_util_icu_alternatives_android.cc ('k') | net/http/http_auth_handler_basic.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_cert_types_mac.cc
diff --git a/net/cert/x509_cert_types_mac.cc b/net/cert/x509_cert_types_mac.cc
index 244fe99d649efe1146904ee31e5846f14fd9339d..756d2e2d8166310a204e4c8cecfea5b3c0cfb482 100644
--- a/net/cert/x509_cert_types_mac.cc
+++ b/net/cert/x509_cert_types_mac.cc
@@ -115,7 +115,7 @@ std::string DataToString(CSSM_DATA data) {
// Converts raw CSSM_DATA in ISO-8859-1 to a std::string in UTF-8.
std::string Latin1DataToUTF8String(CSSM_DATA data) {
base::string16 utf16;
- if (!ConvertLatin1ToUTF16(DataToString(data), &utf16))
+ if (!ConvertToUTF16(DataToString(data), kLatin1, &utf16))
return "";
return base::UTF16ToUTF8(utf16);
}
« net/base/net_string_util.h ('K') | « net/base/net_string_util_icu_alternatives_android.cc ('k') | net/http/http_auth_handler_basic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698