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

chrome/test/plugin/pdf_browsertest.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 286 matching lines @@
   std::string base_url = std::string("files/");
 
   file_util::FileEnumerator file_enumerator(
       ui_test_utils::GetTestFilePath(GetPDFTestDir(), FilePath()),
       false,
       file_util::FileEnumerator::FILES,
       FILE_PATH_LITERAL("*.pdf"));
   for (FilePath file_path = file_enumerator.Next();
        !file_path.empty();
        file_path = file_enumerator.Next()) {
-    std::string filename = WideToASCII(file_path.BaseName().ToWStringHack());
+    std::string filename =
+        UTF16ToASCII(file_path.BaseName().LossyDisplayName());

[Mark Mentovai, 2011/02/01 22:54:55]

To ASCII? Hmm.

 
 #if defined(OS_MACOSX) || defined(OS_LINUX)
     if (filename == "sample.pdf")
       continue;  // Crashes on Mac and Linux.  http://crbug.com/63549
 #endif
 
     LOG(WARNING) << "PDFBrowserTest.Loading: " << filename;
 
     GURL url = pdf_test_server()->GetURL(base_url + filename);
     ui_test_utils::NavigateToURL(browser(), url);
@@ skipping 15 matching lines @@
       // Check if the LOAD_STOP notification could have come while we run a
       // nested message loop for the JS call.
       if (last_count != load_stop_notification_count())
         continue;
       ui_test_utils::WaitForLoadStop(controller);
     }
   }
 }
 
 }  // namespace