Convert infobar APIs to UTF-16.

chrome/browser/tab_contents/infobar_delegate.cc

 // Copyright (c) 2006-2008 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/tab_contents/infobar_delegate.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ skipping 37 matching lines @@
 }
 
 // LinkInfoBarDelegate: --------------------------------------------------------
 
 LinkInfoBarDelegate::LinkInfoBarDelegate(TabContents* contents)
     : InfoBarDelegate(contents) {
 }
 
 // ConfirmInfoBarDelegate: -----------------------------------------------------
 
-std::wstring ConfirmInfoBarDelegate::GetButtonLabel(
+string16 ConfirmInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_OK);
+    return l10n_util::GetStringUTF16(IDS_OK);
   if (button == BUTTON_CANCEL)
-    return l10n_util::GetString(IDS_CANCEL);
+    return l10n_util::GetStringUTF16(IDS_CANCEL);
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 ConfirmInfoBarDelegate::ConfirmInfoBarDelegate(TabContents* contents)
     : AlertInfoBarDelegate(contents) {
 }
 
 // SimpleAlertInfoBarDelegate: -------------------------------------------------
 
 SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
     TabContents* contents,
-    const std::wstring& message,
+    const string16& message,
     SkBitmap* icon,
     bool auto_expire)
     : AlertInfoBarDelegate(contents),
       message_(message),
       icon_(icon),
       auto_expire_(auto_expire) {
 }
 
 bool SimpleAlertInfoBarDelegate::ShouldExpire(
       const NavigationController::LoadCommittedDetails& details) const {
   if (auto_expire_)
     return AlertInfoBarDelegate::ShouldExpire(details);
 
   return false;
 }
 
-std::wstring SimpleAlertInfoBarDelegate::GetMessageText() const {
+string16 SimpleAlertInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
 SkBitmap* SimpleAlertInfoBarDelegate::GetIcon() const {
   return icon_;
 }
 
 void SimpleAlertInfoBarDelegate::InfoBarClosed() {
   delete this;
 }