FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

chrome/browser/plugin_observer.cc

 // Copyright (c) 2011 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/plugin_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/plugin_installer_infobar_delegate.h"
@@ skipping 240 matching lines @@
 void PluginObserver::OnMissingPluginStatus(int status) {
 #if defined(OS_WIN)
 // TODO(PORT): pull in when plug-ins work
   GetPluginInstaller()->OnMissingPluginStatus(status);
 #endif
 }
 
 void PluginObserver::OnCrashedPlugin(const FilePath& plugin_path) {
   DCHECK(!plugin_path.value().empty());
 
-  std::wstring plugin_name = plugin_path.ToWStringHack();
+  string16 plugin_name = plugin_path.LossyDisplayName();
   webkit::npapi::WebPluginInfo plugin_info;
   if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
           plugin_path, &plugin_info) &&
       !plugin_info.name.empty()) {
-    plugin_name = UTF16ToWide(plugin_info.name);
+    plugin_name = plugin_info.name;
 #if defined(OS_MACOSX)
     // Many plugins on the Mac have .plugin in the actual name, which looks
     // terrible, so look for that and strip it off if present.
-    const std::wstring plugin_extension(L".plugin");
-    if (EndsWith(plugin_name, plugin_extension, true))
-      plugin_name.erase(plugin_name.length() - plugin_extension.length());
+    const string kPluginExtension = ".plugin";
+    if (EndsWith(plugin_name, ASCIIToUTF16(kPluginExtension), true))
+      plugin_name.erase(plugin_name.length() - kPluginExtension.length());
 #endif  // OS_MACOSX
   }
   SkBitmap* crash_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_PLUGIN_CRASHED);
   tab_contents_->AddInfoBar(new SimpleAlertInfoBarDelegate(
       tab_contents_, crash_icon,
-      l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT,
-                                 WideToUTF16Hack(plugin_name)), true));
+      l10n_util::GetStringFUTF16(IDS_PLUGIN_CRASHED_PROMPT, plugin_name),
+      true));
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
                                                   const GURL& update_url) {
   if (!update_url.is_empty())
     new OutdatedPluginInfoBar(tab_contents_, name, update_url);
   else
     new BlockedPluginInfoBar(tab_contents_, name);
 }