Remove wstring from l10n_util. Part 4.

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

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

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

4 files changed, 31 insertions, 24 deletions

diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 6fa8dee..b1b691f 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
@@ -165,7 +166,7 @@ void ButtonDropDown::ShowDropDownMenu(gfx::NativeView window) {
 ////////////////////////////////////////////////////////////////////////////////
 
 std::wstring ButtonDropDown::GetAccessibleDefaultAction() {
-  return l10n_util::GetString(IDS_APP_ACCACTION_PRESS);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS));
 }
 
 AccessibilityTypes::Role ButtonDropDown::GetAccessibleRole() {
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 1b94359..e7d746a 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -7,6 +7,7 @@
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
@@ -256,7 +257,7 @@ void MenuButton::OnMouseExited(const MouseEvent& event) {
 ////////////////////////////////////////////////////////////////////////////////
 
 std::wstring MenuButton::GetAccessibleDefaultAction() {
-  return l10n_util::GetString(IDS_APP_ACCACTION_PRESS);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS));
 }
 
 AccessibilityTypes::Role MenuButton::GetAccessibleRole() {
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index cfec12c..17e8ef8 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -34,7 +34,8 @@ class EmptyMenuMenuItem : public MenuItemView {
  public:
   explicit EmptyMenuMenuItem(MenuItemView* parent)
       : MenuItemView(parent, 0, NORMAL) {
-    SetTitle(l10n_util::GetString(IDS_APP_MENU_EMPTY_SUBMENU));
+    SetTitle(UTF16ToWide(
+        l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index d170b50..12f98c1 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -13,6 +13,8 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -574,36 +576,38 @@ void BitmapScrollBar::ShowContextMenu(View* source,
 // BitmapScrollBar, Menu::Delegate implementation:
 
 std::wstring BitmapScrollBar::GetLabel(int id) const {
+  int ids_value = 0;
   switch (id) {
     case ScrollBarContextMenuCommand_ScrollHere:
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE);
+      ids_value = IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE;
+      break;
     case ScrollBarContextMenuCommand_ScrollStart:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME);
+      ids_value = IsHorizontal() ? IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE
+                                 : IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME;
+      break;
     case ScrollBarContextMenuCommand_ScrollEnd:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLEND);
+      ids_value = IsHorizontal() ? IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE
+                                 : IDS_APP_SCROLLBAR_CXMENU_SCROLLEND;
+      break;
     case ScrollBarContextMenuCommand_ScrollPageUp:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP);
+      ids_value = IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP;
+      break;
     case ScrollBarContextMenuCommand_ScrollPageDown:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
+      ids_value = IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN;
+      break;
     case ScrollBarContextMenuCommand_ScrollPrev:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLUP);
+      ids_value = IsHorizontal() ? IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT
+                                 : IDS_APP_SCROLLBAR_CXMENU_SCROLLUP;
+      break;
     case ScrollBarContextMenuCommand_ScrollNext:
-      if (IsHorizontal())
-        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT);
-      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN);
+      ids_value = IsHorizontal() ? IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT
+                                 : IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN;
+      break;
+    default:
+      NOTREACHED() << "Invalid BitmapScrollBar Context Menu command!";
   }
-  NOTREACHED() << "Invalid BitmapScrollBar Context Menu command!";
-  return L"";
+
+  return ids_value ? UTF16ToWide(l10n_util::GetStringUTF16(ids_value)) : L"";
 }
 
 bool BitmapScrollBar::IsCommandEnabled(int id) const {