Convert infobar APIs to UTF-16.

chrome/browser/alternate_nav_url_fetcher.cc

Index: chrome/browser/alternate_nav_url_fetcher.cc
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index ebe136ef8b69f16578de7abb3b57295337d4d1df..4e329cdd8e74ef625e9741d7a7d3f56209ba1e79 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -95,16 +95,16 @@ void AlternateNavURLFetcher::OnURLFetchComplete(const URLFetcher* source,
   ShowInfobarIfPossible();
 }
 
-std::wstring AlternateNavURLFetcher::GetMessageTextWithOffset(
+string16 AlternateNavURLFetcher::GetMessageTextWithOffset(
     size_t* link_offset) const {
-  const std::wstring label = l10n_util::GetStringF(
-      IDS_ALTERNATE_NAV_URL_VIEW_LABEL, std::wstring(), link_offset);
-  DCHECK(*link_offset != std::wstring::npos);
+  const string16 label = l10n_util::GetStringFUTF16(
+      IDS_ALTERNATE_NAV_URL_VIEW_LABEL, string16(), link_offset);
+  DCHECK(*link_offset != string16::npos);
   return label;
 }
 
-std::wstring AlternateNavURLFetcher::GetLinkText() const {
-  return UTF8ToWide(alternate_nav_url_.spec());
+string16 AlternateNavURLFetcher::GetLinkText() const {
+  return UTF8ToUTF16(alternate_nav_url_.spec());
 }
 
 SkBitmap* AlternateNavURLFetcher::GetIcon() const {