Convert infobar APIs to UTF-16.

chrome/browser/extensions/theme_installed_infobar_delegate.cc

 // Copyright (c) 2010 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/extensions/theme_installed_infobar_delegate.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 25 matching lines @@
   // We don't want any notifications while we're running our destructor.
   registrar_.RemoveAll();
 
   profile_->GetThemeProvider()->OnInfobarDestroyed();
 }
 
 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 {
   // TODO(aa): Reply with the theme's icon, but this requires reading it
   // asynchronously from disk.
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_THEME);
 }
 
 ThemeInstalledInfoBarDelegate*
     ThemeInstalledInfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return this;
 }
 
 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();
   }
 }
 
 bool ThemeInstalledInfoBarDelegate::Cancel() {
   if (!previous_theme_id_.empty()) {
     ExtensionsService* service = profile_->GetExtensionsService();
     if (service) {
       Extension* previous_theme =
           service->GetExtensionById(previous_theme_id_, true);
       if (previous_theme) {
@@ skipping 22 matching lines @@
     }
 
     default:
       NOTREACHED();
   }
 }
 
 bool ThemeInstalledInfoBarDelegate::MatchesTheme(Extension* theme) {
   return (theme && theme->id() == theme_id_);
 }