Convert infobar APIs to UTF-16.

chrome/browser/cocoa/keystone_infobar.mm

Index: chrome/browser/cocoa/keystone_infobar.mm
diff --git a/chrome/browser/cocoa/keystone_infobar.mm b/chrome/browser/cocoa/keystone_infobar.mm
index 377818a3e382e2ce4aae9cae0e74c1628b637a56..7957605578ebe223f916880fd4152b76f55ad575 100644
--- a/chrome/browser/cocoa/keystone_infobar.mm
+++ b/chrome/browser/cocoa/keystone_infobar.mm
@@ -62,9 +62,9 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
 
   // Inherited from AlertInfoBarDelegate and overridden.
 
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetStringF(IDS_PROMOTE_INFOBAR_TEXT,
-                                 l10n_util::GetString(IDS_PRODUCT_NAME));
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringFUTF16(IDS_PROMOTE_INFOBAR_TEXT,
+        l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
 
   virtual SkBitmap* GetIcon() const {
@@ -78,10 +78,10 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
     return BUTTON_OK | BUTTON_CANCEL | BUTTON_OK_DEFAULT;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     return button == BUTTON_OK ?
-        l10n_util::GetString(IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON) :
-        l10n_util::GetString(IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON);
+        l10n_util::GetStringUTF16(IDS_PROMOTE_INFOBAR_PROMOTE_BUTTON) :
+        l10n_util::GetStringUTF16(IDS_PROMOTE_INFOBAR_DONT_ASK_BUTTON);
   }
 
   virtual bool Accept() {