Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/ssl/ssl_manager.cc

Index: chrome/browser/ssl/ssl_manager.cc
===================================================================
--- chrome/browser/ssl/ssl_manager.cc	(revision 70280)
+++ chrome/browser/ssl/ssl_manager.cc	(working copy)
@@ -95,18 +95,17 @@
 }
 
 // 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)