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

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index ed4617fa58974fb71b0447d4c89fcf32698ca7d4..fc182929147c39ebcc0f6a7cd1a59cceb2082cfd 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1051,7 +1051,7 @@ bool BrowserView::IsLabelForCommandIdDynamic(int command_id) const {
   return command_id == IDC_RESTORE_TAB;
 }
 
-std::wstring BrowserView::GetLabelForCommandId(int command_id) const {
+string16 BrowserView::GetLabelForCommandId(int command_id) const {
   DCHECK(command_id == IDC_RESTORE_TAB);
 
   int string_id = IDS_RESTORE_TAB;
@@ -1060,7 +1060,7 @@ std::wstring BrowserView::GetLabelForCommandId(int command_id) const {
     if (trs && trs->entries().front()->type == TabRestoreService::WINDOW)
       string_id = IDS_RESTORE_WINDOW;
   }
-  return l10n_util::GetString(string_id);
+  return l10n_util::GetStringUTF16(string_id);
 }
 
 void BrowserView::ExecuteCommand(int command_id) {