Convert infobar APIs to UTF-16.

chrome/browser/blocked_plugin_manager.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/blocked_plugin_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 11 matching lines @@
 }
 
 void BlockedPluginManager::OnBlockedPluginLoaded() {
   tab_contents_->RemoveInfoBar(this);
 }
 
 int BlockedPluginManager::GetButtons() const {
   return BUTTON_OK;
 }
 
-std::wstring BlockedPluginManager::GetButtonLabel(InfoBarButton button) const {
+string16 BlockedPluginManager::GetButtonLabel(InfoBarButton button) const {
   if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_PLUGIN_LOAD_SHORT);
+    return l10n_util::GetStringUTF16(IDS_PLUGIN_LOAD_SHORT);
   return ConfirmInfoBarDelegate::GetButtonLabel(button);
 }
 
-std::wstring BlockedPluginManager::GetMessageText() const {
-  return UTF16ToWide(l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_PROMPT,
-                                                name_));
+string16 BlockedPluginManager::GetMessageText() const {
+  return l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_PROMPT, name_);
 }
 
-std::wstring BlockedPluginManager::GetLinkText() {
-  return l10n_util::GetString(IDS_LEARN_MORE);
+string16 BlockedPluginManager::GetLinkText() {
+  return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 SkBitmap* BlockedPluginManager::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_PLUGIN_INSTALL);
 }
 
 bool BlockedPluginManager::Accept() {
   tab_contents_->render_view_host()->LoadBlockedPlugins();
   return true;
 }
 
 bool BlockedPluginManager::LinkClicked(WindowOpenDisposition disposition) {
   // TODO(bauerb): Navigate to a help page explaining why we blocked the plugin,
   // once we have one.
   return false;
 }