Convert infobar APIs to UTF-16.

chrome/browser/cocoa/keystone_infobar.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/cocoa/keystone_infobar.h"
 
 #import <AppKit/AppKit.h>
 
 #include <string>
 
@@ skipping 44 matching lines @@
     const NavigationController::LoadCommittedDetails& details) {
     return can_expire_;
   }
 
   virtual void InfoBarClosed() {
     delete this;
   }
 
   // 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 {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_PRODUCT_ICON_32);
   }
 
   // Inherited from ConfirmInfoBarDelegate and overridden.
 
   virtual int GetButtons() const {
     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() {
     [[KeystoneGlue defaultKeystoneGlue] promoteTicket];
     return true;
   }
 
   virtual bool Cancel() {
     profile_->GetPrefs()->SetBoolean(prefs::kShowUpdatePromotionInfoBar, false);
     return true;
@@ skipping 108 matching lines @@
 
 @end  // @implementation KeystonePromotionInfoBar
 
 // static
 void KeystoneInfoBar::PromotionInfoBar(Profile* profile) {
   KeystonePromotionInfoBar* promotionInfoBar =
       [[[KeystonePromotionInfoBar alloc] init] autorelease];
 
   [promotionInfoBar checkAndShowInfoBarForProfile:profile];
 }