Convert infobar APIs to UTF-16.

chrome/browser/extensions/theme_installed_infobar_delegate.cc

Index: chrome/browser/extensions/theme_installed_infobar_delegate.cc
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 4e9ac351b09b2753ba1714d19f61e73e81936fdd..4fb501de6c84ab3ff51faa29a59b7ce7f5605c0e 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -43,9 +43,9 @@ void ThemeInstalledInfoBarDelegate::InfoBarClosed() {
   delete this;
 }
 
-std::wstring ThemeInstalledInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringF(IDS_THEME_INSTALL_INFOBAR_LABEL,
-                               UTF8ToWide(name_));
+string16 ThemeInstalledInfoBarDelegate::GetMessageText() const {
+  return l10n_util::GetStringFUTF16(IDS_THEME_INSTALL_INFOBAR_LABEL,
+                                    UTF8ToUTF16(name_));
 }
 
 SkBitmap* ThemeInstalledInfoBarDelegate::GetIcon() const {
@@ -64,16 +64,16 @@ int ThemeInstalledInfoBarDelegate::GetButtons() const {
   return BUTTON_CANCEL;
 }
 
-std::wstring ThemeInstalledInfoBarDelegate::GetButtonLabel(
+string16 ThemeInstalledInfoBarDelegate::GetButtonLabel(
     ConfirmInfoBarDelegate::InfoBarButton button) const {
   switch (button) {
     case BUTTON_CANCEL: {
-      return l10n_util::GetString(IDS_THEME_INSTALL_INFOBAR_UNDO_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_THEME_INSTALL_INFOBAR_UNDO_BUTTON);
     }
     default:
       // The InfoBar will create a default OK button and make it invisible.
       // TODO(mirandac): remove the default OK button from ConfirmInfoBar.
-      return L"";
+      return string16();
   }
 }