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

chrome/browser/ui/app_modal_dialogs/message_box_handler.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/ui/app_modal_dialogs/message_box_handler.h"
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
@@ skipping 15 matching lines @@
                              bool is_alert,
                              const GURL& frame_url) {
   ExtensionService* extensions_service = profile->GetExtensionService();
   if (extensions_service) {
     const Extension* extension =
         extensions_service->GetExtensionByURL(frame_url);
     if (!extension)
       extension = extensions_service->GetExtensionByWebExtent(frame_url);
 
     if (extension && (extension->location() == Extension::COMPONENT)) {
-      return UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+      return l10n_util::GetString(IDS_PRODUCT_NAME);
     } else if (extension && !extension->name().empty()) {
       return UTF8ToWide(extension->name());
     }
   }
   if (!frame_url.has_host()) {
-    return UTF16ToWideHack(l10n_util::GetStringUTF16(
+    return l10n_util::GetString(
         is_alert ? IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE
-                 : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE));
+                 : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
   }
 
   // TODO(brettw) it should be easier than this to do the correct language
   // handling without getting the accept language from the profile.
   string16 base_address = gfx::ElideUrl(frame_url.GetOrigin(),
       gfx::Font(), 0,
       UTF8ToWide(profile->GetPrefs()->GetString(prefs::kAcceptLanguages)));
 
   // Force URL to have LTR directionality.
   base_address = base::i18n::GetDisplayStringInLTRDirectionality(
@@ skipping 16 matching lines @@
   bool is_alert = dialog_flags == MessageBoxFlags::kIsJavascriptAlert;
   std::wstring title = GetTitle(profile, is_alert, frame_url);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       delegate, title, dialog_flags, message_text, default_prompt_text,
       display_suppress_checkbox, false, reply_msg));
 }
 
 void RunBeforeUnloadDialog(TabContents* tab_contents,
                            const std::wstring& message_text,
                            IPC::Message* reply_msg) {
-  std::wstring full_message = message_text + L"\n\n" + UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER));
+  std::wstring full_message =
+      message_text + L"\n\n" +
+      l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
-      tab_contents,
-      UTF16ToWideHack(
-          l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE)),
-      MessageBoxFlags::kIsJavascriptConfirm,
-      message_text,
-      std::wstring(),
-      false,
-      true,
-      reply_msg));
+      tab_contents, l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE),
+      MessageBoxFlags::kIsJavascriptConfirm, message_text, std::wstring(),
+      false, true, reply_msg));
 }