Convert infobar APIs to UTF-16.

chrome/browser/alternate_nav_url_fetcher.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/alternate_nav_url_fetcher.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intranet_redirect_detector.h"
@@ skipping 77 matching lines @@
                                                 const GURL& url,
                                                 const URLRequestStatus& status,
                                                 int response_code,
                                                 const ResponseCookies& cookies,
                                                 const std::string& data) {
   DCHECK(fetcher_.get() == source);
   SetStatusFromURLFetch(url, status, response_code);
   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 {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_ALT_NAV_URL);
 }
 
 bool AlternateNavURLFetcher::LinkClicked(WindowOpenDisposition disposition) {
   infobar_contents_->OpenURL(
       alternate_nav_url_, GURL(), disposition,
@@ skipping 41 matching lines @@
     if (state_ == FAILED)
       delete this;
     return;
   }
 
   infobar_contents_ = controller_->tab_contents();
   StoreActiveEntryUniqueID(infobar_contents_);
   // We will be deleted when the InfoBar is destroyed. (See InfoBarClosed).
   infobar_contents_->AddInfoBar(this);
 }