From 1308ac961fdd5148ce95e228fe192175584a5464 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Wed, 29 Dec 2010 22:10:13 +0000 Subject: Revert 70271 - Remove wstring from l10n_util. Part 3. BUG=9911 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6044006 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6051012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70281 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ssl/ssl_manager.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chrome/browser/ssl/ssl_manager.cc') diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 597d3ca..f874cc0 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -95,18 +95,17 @@ bool SSLManager::DeserializeSecurityInfo(const std::string& state, } // static -string16 SSLManager::GetEVCertName(const net::X509Certificate& cert) { +std::wstring SSLManager::GetEVCertName(const net::X509Certificate& cert) { // EV are required to have an organization name and country. if (cert.subject().organization_names.empty() || cert.subject().country_name.empty()) { NOTREACHED(); - return string16(); + return std::wstring(); } - return l10n_util::GetStringFUTF16( - IDS_SECURE_CONNECTION_EV, - UTF8ToUTF16(cert.subject().organization_names[0]), - UTF8ToUTF16(cert.subject().country_name)); + return l10n_util::GetStringF(IDS_SECURE_CONNECTION_EV, + UTF8ToWide(cert.subject().organization_names[0]), + UTF8ToWide(cert.subject().country_name)); } SSLManager::SSLManager(NavigationController* controller) -- cgit v1.1