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

chrome/browser/ui/login/login_prompt.cc

 // Copyright (c) 2009 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/ui/login/login_prompt.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 367 matching lines @@
         TabContentsWrapper::property_accessor()->GetProperty(
             parent_contents->property_bag());
     if (!wrapper)
       return;
     PasswordManager* password_manager = (*wrapper)->GetPasswordManager();
     std::vector<PasswordForm> v;
     MakeInputForPasswordManager(&v);
     password_manager->PasswordFormsFound(v);
     handler_->SetPasswordManager(password_manager);
 
-    string16 host_and_port_hack16 = WideToUTF16Hack(auth_info_->host_and_port);
-    string16 realm_hack16 = WideToUTF16Hack(auth_info_->realm);
-    string16 explanation = realm_hack16.empty() ?
-        l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
-                                   host_and_port_hack16) :
-        l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION,
-                                   host_and_port_hack16,
-                                   realm_hack16);
+    std::wstring explanation = auth_info_->realm.empty() ?
+        l10n_util::GetStringF(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
+                              auth_info_->host_and_port) :
+        l10n_util::GetStringF(IDS_LOGIN_DIALOG_DESCRIPTION,
+                              auth_info_->host_and_port,
+                              auth_info_->realm);
     handler_->BuildViewForPasswordManager(password_manager,
-                                          UTF16ToWideHack(explanation));
+                                          explanation);
   }
 
  private:
   // Helper to create a PasswordForm and stuff it into a vector as input
   // for PasswordManager::PasswordFormsFound, the hook into PasswordManager.
   void MakeInputForPasswordManager(
       std::vector<PasswordForm>* password_manager_input) {
     PasswordForm dialog_form;
     if (LowerCaseEqualsASCII(auth_info_->scheme, "basic")) {
       dialog_form.scheme = PasswordForm::SCHEME_BASIC;
@@ skipping 38 matching lines @@
 // Public API
 
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 net::URLRequest* request) {
   LoginHandler* handler = LoginHandler::Create(auth_info, request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, new LoginDialogTask(
           request->url(), auth_info, handler));
   return handler;
 }