Remove wstring from l10n_util. Part 5.

BUG=9911
TEST=no visible changes; all tests pass

Review URL: http://codereview.chromium.org/6023012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70530 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 19 deletions

diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
index 24fc64a..bd08dd3 100644
--- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc
@@ -295,7 +295,7 @@ void ImageBurnHandler::UpdateBurnProgress(int64 total_burnt,
                                           chromeos::BurnEventType event) {
   DictionaryValue progress_value;
   progress_value.SetString("progress_status_text",
-      WideToUTF16Hack(GetBurnProgressText(total_burnt, image_size)));
+      GetBurnProgressText(total_burnt, image_size));
   if (event == chromeos::BURN_UPDATED)
     progress_value.SetString("state", "IN_PROGRESS");
   else if (event == chromeos::BURN_CANCELED)
@@ -309,26 +309,24 @@ void ImageBurnHandler::UpdateBurnProgress(int64 total_burnt,
   dom_ui_->CallJavascriptFunction(L"burnProgressUpdated", progress_value);
 }
 
-std::wstring ImageBurnHandler::GetBurnProgressText(int64 total_burnt,
-                                                   int64 image_size) {
+string16 ImageBurnHandler::GetBurnProgressText(int64 total_burnt,
+                                               int64 image_size) {
   DataUnits amount_units = GetByteDisplayUnits(total_burnt);
-  std::wstring burnt_size =
-      UTF16ToWideHack(FormatBytes(total_burnt, amount_units, true));
+  string16 burnt_size = FormatBytes(total_burnt, amount_units, true);
 
   base::i18n::AdjustStringForLocaleDirection(&burnt_size);
 
   if (image_size) {
     amount_units = GetByteDisplayUnits(image_size);
-    std::wstring total_text =
-        UTF16ToWideHack(FormatBytes(image_size, amount_units, true));
+    string16 total_text = FormatBytes(image_size, amount_units, true);
     base::i18n::AdjustStringForLocaleDirection(&total_text);
 
-    return l10n_util::GetStringF(IDS_IMAGEBURN_BURN_PROGRESS,
-                                 burnt_size,
-                                 total_text);
+    return l10n_util::GetStringFUTF16(IDS_IMAGEBURN_BURN_PROGRESS,
+                                      burnt_size,
+                                      total_text);
   } else {
-    return l10n_util::GetStringF(IDS_IMAGEBURN_BURN_PROGRESS_SIZE_UNKNOWN,
-                                  burnt_size);
+    return l10n_util::GetStringFUTF16(IDS_IMAGEBURN_BURN_PROGRESS_SIZE_UNKNOWN,
+                                      burnt_size);
   }
 }
 
diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.h b/chrome/browser/chromeos/dom_ui/imageburner_ui.h
index 44041e5..97624ac 100644
--- a/chrome/browser/chromeos/dom_ui/imageburner_ui.h
+++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,6 +13,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/burn_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -113,7 +114,7 @@ class ImageBurnHandler : public DOMMessageHandler,
 
   void UpdateBurnProgress(int64 total_burnt, int64 image_size,
                           const std::string& path, chromeos::BurnEventType evt);
-  std::wstring GetBurnProgressText(int64 total_burnt, int64 image_size);
+  string16 GetBurnProgressText(int64 total_burnt, int64 image_size);
 
   // helper functions
   void CreateImageUrl();
diff --git a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc
index fcf69fa..547615e 100644
--- a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc
@@ -37,12 +37,12 @@ class WrenchMenuSourceDelegate : public chromeos::MenuSourceDelegate {
     config->SetInteger("IDC_ZOOM_PLUS", IDC_ZOOM_PLUS);
     config->SetInteger("IDC_FULLSCREEN", IDC_FULLSCREEN);
 
-    config->SetString("IDS_EDIT2", WideToUTF8(l10n_util::GetString(IDS_EDIT2)));
+    config->SetString("IDS_EDIT2", l10n_util::GetStringUTF8(IDS_EDIT2));
     config->SetString("IDS_ZOOM_MENU2",
-                      WideToUTF8(l10n_util::GetString(IDS_ZOOM_MENU2)));
-    config->SetString("IDS_CUT", WideToUTF8(l10n_util::GetString(IDS_CUT)));
-    config->SetString("IDS_COPY", WideToUTF8(l10n_util::GetString(IDS_COPY)));
-    config->SetString("IDS_PASTE", WideToUTF8(l10n_util::GetString(IDS_PASTE)));
+                      l10n_util::GetStringUTF8(IDS_ZOOM_MENU2));
+    config->SetString("IDS_CUT", l10n_util::GetStringUTF8(IDS_CUT));
+    config->SetString("IDS_COPY", l10n_util::GetStringUTF8(IDS_COPY));
+    config->SetString("IDS_PASTE", l10n_util::GetStringUTF8(IDS_PASTE));
   }
 };