Convert infobar APIs to UTF-16.

chrome/browser/plugin_installer.cc

Index: chrome/browser/plugin_installer.cc
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index 2d0e0a3fbf79690490954044c4874b344b5ce572..1b1d0c504a99c9936fd72669cc46435061db5dd5 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -43,8 +43,8 @@ void PluginInstaller::OnMissingPluginStatus(int status) {
   }
 }
 
-std::wstring PluginInstaller::GetMessageText() const {
-  return l10n_util::GetString(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
+string16 PluginInstaller::GetMessageText() const {
+  return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT);
 }
 
 SkBitmap* PluginInstaller::GetIcon() const {
@@ -56,9 +56,9 @@ int PluginInstaller::GetButtons() const {
   return BUTTON_OK;
 }
 
-std::wstring PluginInstaller::GetButtonLabel(InfoBarButton button) const {
+string16 PluginInstaller::GetButtonLabel(InfoBarButton button) const {
   if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
+    return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON);
   return ConfirmInfoBarDelegate::GetButtonLabel(button);
 }
 
@@ -67,8 +67,8 @@ bool PluginInstaller::Accept() {
   return true;
 }
 
-std::wstring PluginInstaller::GetLinkText() {
-  return l10n_util::GetString(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
+string16 PluginInstaller::GetLinkText() {
+  return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING);
 }
 
 bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) {