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

Unified Diff: net/cert/x509_cert_types_mac.cc

Issue 112963005: Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « net/cert/nss_cert_database_unittest.cc ('k') | net/cert/x509_cert_types_win.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 6439c7f3e77391df933b614dd9edda871f1249a2..2e4f28c8fd3ee0ff332ff800a70753e77d22b0a7 100644
--- a/net/cert/x509_cert_types_mac.cc
+++ b/net/cert/x509_cert_types_mac.cc
@@ -116,7 +116,7 @@ std::string Latin1DataToUTF8String(CSSM_DATA data) {
if (!CodepageToUTF16(DataToString(data), base::kCodepageLatin1,
base::OnStringConversionError::FAIL, &utf16))
return "";
- return UTF16ToUTF8(utf16);
+ return base::UTF16ToUTF8(utf16);
}
// Converts big-endian UTF-16 to UTF-8 in a std::string.
@@ -125,7 +125,7 @@ bool UTF16BigEndianToUTF8(base::char16* chars, size_t length,
std::string* out_string) {
for (size_t i = 0; i < length; i++)
chars[i] = EndianU16_BtoN(chars[i]);
- return UTF16ToUTF8(chars, length, out_string);
+ return base::UTF16ToUTF8(chars, length, out_string);
}
// Converts big-endian UTF-32 to UTF-8 in a std::string.
@@ -135,7 +135,7 @@ bool UTF32BigEndianToUTF8(char32* chars, size_t length,
for (size_t i = 0; i < length; ++i)
chars[i] = EndianS32_BtoN(chars[i]);
#if defined(WCHAR_T_IS_UTF32)
- return WideToUTF8(reinterpret_cast<const wchar_t*>(chars),
+ return base::WideToUTF8(reinterpret_cast<const wchar_t*>(chars),
length, out_string);
#else
#error This code doesn't handle 16-bit wchar_t.
« no previous file with comments | « net/cert/nss_cert_database_unittest.cc ('k') | net/cert/x509_cert_types_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698