Convert infobar APIs to UTF-16.

chrome/browser/omnibox_search_hint.cc

Index: chrome/browser/omnibox_search_hint.cc
diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
index d0ac2685b9a4bab43e4a31aa70d8754b0347d80c..470532dc5eb9f6b29b462a5e0ed9a8b0f71ba0ae 100644
--- a/chrome/browser/omnibox_search_hint.cc
+++ b/chrome/browser/omnibox_search_hint.cc
@@ -70,8 +70,8 @@ class HintInfoBar : public ConfirmInfoBarDelegate {
     omnibox_hint_->DisableHint();
   }
 
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetString(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_TEXT);
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_TEXT);
   }
 
   virtual SkBitmap* GetIcon() const {
@@ -83,8 +83,9 @@ class HintInfoBar : public ConfirmInfoBarDelegate {
     return BUTTON_OK;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
-    return l10n_util::GetString(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_BUTTON_LABEL);
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
+    return l10n_util::GetStringUTF16(
+        IDS_OMNIBOX_SEARCH_HINT_INFOBAR_BUTTON_LABEL);
   }
 
   virtual Type GetInfoBarType() { return PAGE_ACTION_TYPE; }