net/cert/x509_cert_types_mac.cc - Issue 266053002: Implement alternative string conversion functions in net/ on Android,

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Remove GN changes Created 6 years, 7 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:

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..d5b2ea35ff246cfe837d6042fa32a849a04fadc7 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), kCharsetLatin1, &utf16))

return "";

return base::UTF16ToUTF8(utf16);

}