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

chrome/browser/chromeos/options/wifi_config_view.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/chromeos/options/wifi_config_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 176 matching lines @@
     passphrase_textfield_->SetText(string16());
   } else {
     passphrase_textfield_->SetEnabled(true);
   }
   UpdateCanLogin();
 }
 
 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.
 }
 
 bool WifiConfigView::Login() {
   std::string identity_string;
   if (identity_textfield_ != NULL) {
     identity_string = UTF16ToUTF8(identity_textfield_->text());
   }
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   bool connected = false;
@@ skipping 199 matching lines @@
   error_label_ = new views::Label();
   error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   error_label_->SetColor(SK_ColorRED);
   layout->AddView(error_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   // Set or hide the error text.
   UpdateErrorLabel(false);
 }
 
 }  // namespace chromeos