Convert infobar APIs to UTF-16.

chrome/browser/autofill/autofill_cc_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/autofill/autofill_cc_infobar_delegate.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "chrome/browser/autofill/autofill_cc_infobar.h"
@@ skipping 37 matching lines @@
 void AutoFillCCInfoBarDelegate::InfoBarClosed() {
   if (host_) {
     host_->OnInfoBarClosed(false);
     host_ = NULL;
   }
 
   // This will delete us.
   ConfirmInfoBarDelegate::InfoBarClosed();
 }
 
-std::wstring AutoFillCCInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetString(IDS_AUTOFILL_CC_INFOBAR_TEXT);
+string16 AutoFillCCInfoBarDelegate::GetMessageText() const {
+  return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
 }
 
 SkBitmap* AutoFillCCInfoBarDelegate::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_AUTOFILL);
 }
 
 int AutoFillCCInfoBarDelegate::GetButtons() const {
   return BUTTON_OK | BUTTON_CANCEL;
 }
 
-std::wstring AutoFillCCInfoBarDelegate::GetButtonLabel(
+string16 AutoFillCCInfoBarDelegate::GetButtonLabel(
     ConfirmInfoBarDelegate::InfoBarButton button) const {
   if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_AUTOFILL_CC_INFOBAR_ACCEPT);
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_ACCEPT);
   else if (button == BUTTON_CANCEL)
-    return l10n_util::GetString(IDS_AUTOFILL_CC_INFOBAR_DENY);
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_DENY);
   else
     NOTREACHED();
 
-  return std::wstring();
+  return string16();
 }
 
 bool AutoFillCCInfoBarDelegate::Accept() {
   UMA_HISTOGRAM_COUNTS("AutoFill.CCInfoBarAccepted", 1);
   if (host_) {
     host_->OnInfoBarClosed(true);
     host_ = NULL;
   }
   return true;
 }
 
 bool AutoFillCCInfoBarDelegate::Cancel() {
   UMA_HISTOGRAM_COUNTS("AutoFill.CCInfoBarDenied", 1);
   if (host_) {
     host_->OnInfoBarClosed(false);
     host_ = NULL;
   }
   return true;
 }
 
-std::wstring AutoFillCCInfoBarDelegate::GetLinkText() {
-  return l10n_util::GetString(IDS_AUTOFILL_CC_LEARN_MORE);
+string16 AutoFillCCInfoBarDelegate::GetLinkText() {
+  return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_LEARN_MORE);
 }
 
 bool AutoFillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   browser_->OpenURL(GURL(kAutoFillLearnMoreUrl), GURL(), NEW_FOREGROUND_TAB,
                     PageTransition::TYPED);
   return false;
 }
 
 #if defined(OS_WIN)
 InfoBar* AutoFillCCInfoBarDelegate::CreateInfoBar() {
   return CreateAutofillCcInfoBar(this);
 }
 #endif  // defined(OS_WIN)