Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/ssl_client_certificate_selector_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl_client_certificate_selector.h"
 
 #include <windows.h>
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 
@@ skipping 23 matching lines @@
   HCERTSTORE client_certs = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, NULL,
                                           0, NULL);
   BOOL ok;
   for (size_t i = 0; i < cert_request_info->client_certs.size(); ++i) {
     PCCERT_CONTEXT cc = cert_request_info->client_certs[i]->os_cert_handle();
     ok = CertAddCertificateContextToStore(client_certs, cc,
                                           CERT_STORE_ADD_ALWAYS, NULL);
     DCHECK(ok);
   }
 
-  std::wstring title = l10n_util::GetString(IDS_CLIENT_CERT_DIALOG_TITLE);
-  std::wstring text = l10n_util::GetStringF(
+  std::wstring title =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLIENT_CERT_DIALOG_TITLE));
+  std::wstring text = UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_CLIENT_CERT_DIALOG_TEXT,
-      ASCIIToWide(cert_request_info->host_and_port));
+      ASCIIToUTF16(cert_request_info->host_and_port)));
   PCCERT_CONTEXT cert_context = CryptUIDlgSelectCertificateFromStore(
       client_certs, parent->GetMessageBoxRootWindow(),
       title.c_str(), text.c_str(), 0, 0, NULL);
 
   net::X509Certificate* cert = NULL;
   if (cert_context) {
     for (size_t i = 0; i < cert_request_info->client_certs.size(); ++i) {
       net::X509Certificate* client_cert = cert_request_info->client_certs[i];
       if (net::X509Certificate::IsSameOSCert(cert_context,
                                              client_cert->os_cert_handle())) {
         cert = client_cert;
         break;
       }
     }
     DCHECK(cert != NULL);
     net::X509Certificate::FreeOSCertHandle(cert_context);
   }
 
   ok = CertCloseStore(client_certs, CERT_CLOSE_STORE_CHECK_FLAG);
   DCHECK(ok);
 
   delegate->CertificateSelected(cert);
 }
 
 }  // namespace browser