Convert menu strings to UTF16, fix some views-GTK build errors.

chrome/browser/back_forward_menu_model.cc

Index: chrome/browser/back_forward_menu_model.cc
diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc
index 984d06b35becf6840fe7b010ac37588671e4abba..ff77d13c84cb978ec4c42db5d7b4696985044576 100644
--- a/chrome/browser/back_forward_menu_model.cc
+++ b/chrome/browser/back_forward_menu_model.cc
@@ -205,18 +205,17 @@ bool BackForwardMenuModel::IsSeparator(int menu_id) const {
   return menu_id == history_items + 1;
 }
 
-std::wstring BackForwardMenuModel::GetItemLabel(int menu_id) const {
+string16 BackForwardMenuModel::GetItemLabel(int menu_id) const {
   // Return label "Show Full History" for the last item of the menu.
   if (menu_id == GetTotalItemCount())
-    return l10n_util::GetString(IDS_SHOWFULLHISTORY_LINK);
+    return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK);
 
   // Return an empty string for a separator.
   if (IsSeparator(menu_id))
-    return L"";
+    return string16();
 
   NavigationEntry* entry = GetNavigationEntry(menu_id);
-  return UTF16ToWideHack(entry->GetTitleForDisplay(
-                         &GetTabContents()->controller()));
+  return entry->GetTitleForDisplay(&GetTabContents()->controller());
 }
 
 const SkBitmap& BackForwardMenuModel::GetItemIcon(int menu_id) const {