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

chrome/browser/chromeos/options/wifi_config_view.cc

Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 793976685fc5c40cae7a86c8e935e50b2ab23591..f55c1b5d5e34de0d07445052e2e02077ecc841de 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -194,8 +194,10 @@ void WifiConfigView::ItemChanged(views::Combobox* combo_box,
 void WifiConfigView::FileSelected(const FilePath& path,
                                    int index, void* params) {
   certificate_path_ = path.value();
-  if (certificate_browse_button_)
-    certificate_browse_button_->SetLabel(path.BaseName().ToWStringHack());
+  if (certificate_browse_button_) {
+    certificate_browse_button_->SetLabel(
+        UTF16ToWide(path.BaseName().LossyDisplayName()));
+  }
   UpdateCanLogin();  // TODO(njw) Check if the passphrase decrypts the key.
 }