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

chrome/browser/printing/cloud_print/cloud_print_setup_flow.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/printing/cloud_print/cloud_print_setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "base/json/json_writer.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
@@ skipping 152 matching lines @@
 
 std::string CloudPrintSetupFlow::GetDialogArgs() const {
     return dialog_start_args_;
 }
 
 void CloudPrintSetupFlow::OnCloseContents(TabContents* source,
                                           bool* out_close_dialog) {
 }
 
 std::wstring CloudPrintSetupFlow::GetDialogTitle() const {
-  return UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE));
+  return l10n_util::GetString(IDS_CLOUD_PRINT_SETUP_DIALOG_TITLE);
 }
 
 bool CloudPrintSetupFlow::IsDialogModal() const {
   // We are always modeless.
   return false;
 }
 
 bool CloudPrintSetupFlow::ShouldShowDialogTitle() const {
   return true;
 }
@@ skipping 79 matching lines @@
   args.SetString("pageToShow", "cloudprintsetup");
   args.SetString("user", "");
   args.SetInteger("error", error.state());
   args.SetBoolean("editable_user", true);
   args.SetString("captchaUrl", error.captcha().image_url.spec());
   ShowGaiaLogin(args);
 }
 
 void CloudPrintSetupFlow::ShowSetupDone() {
   setup_done_ = true;
-  string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-  std::wstring message =
-      UTF16ToWideHack(l10n_util::GetStringFUTF16(IDS_CLOUD_PRINT_SETUP_DONE,
-                                                 product_name,
-                                                 UTF8ToUTF16(login_)));
+  std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_NAME);
+  std::wstring message = l10n_util::GetStringF(IDS_CLOUD_PRINT_SETUP_DONE,
+                                               product_name,
+                                               UTF8ToWide(login_));
   std::wstring javascript = L"cloudprint.setMessage('" + message + L"');";
   ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript);
 
   if (dom_ui_) {
     PrefService* prefs = profile_->GetPrefs();
     gfx::Font approximate_web_font(
         UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
         prefs->GetInteger(prefs::kWebKitDefaultFontSize));
     gfx::Size done_size = gfx::GetLocalizedContentsSizeForFont(
         IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS,
@@ skipping 10 matching lines @@
 }
 
 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(
     const std::wstring& iframe_xpath,
     const std::wstring& js) {
   if (dom_ui_) {
     RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();
     rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
   }
 }