Convert infobar APIs to UTF-16.

chrome/browser/extensions/extension_disabled_infobar_delegate.cc

Index: chrome/browser/extensions/extension_disabled_infobar_delegate.cc
diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
index f26c307a09dbfaf1bd92abd6ae0706e79dd247b6..e8ed833741ba64902af1f76fd3cde7e88efe5073 100644
--- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
@@ -77,9 +77,9 @@ class ExtensionDisabledInfobarDelegate
   }
   virtual ~ExtensionDisabledInfobarDelegate() {
   }
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetStringF(IDS_EXTENSION_DISABLED_INFOBAR_LABEL,
-                                 UTF8ToWide(extension_->name()));
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringFUTF16(IDS_EXTENSION_DISABLED_INFOBAR_LABEL,
+                                      UTF8ToUTF16(extension_->name()));
   }
   virtual SkBitmap* GetIcon() const {
     return NULL;
@@ -87,9 +87,10 @@ class ExtensionDisabledInfobarDelegate
   virtual int GetButtons() const {
     return BUTTON_OK;
   }
-  virtual std::wstring GetButtonLabel(
+  virtual string16 GetButtonLabel(
       ConfirmInfoBarDelegate::InfoBarButton button) const {
-    return l10n_util::GetString(IDS_EXTENSION_DISABLED_INFOBAR_ENABLE_BUTTON);
+    return l10n_util::GetStringUTF16(
+        IDS_EXTENSION_DISABLED_INFOBAR_ENABLE_BUTTON);
   }
   virtual bool Accept() {
     // This object manages its own lifetime.