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

chrome/browser/printing/printing_layout_uitest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/simple_thread.h"
@@ skipping 41 matching lines @@
   // |verification_name|. Compares the saved printed job pixels with the test
   // data pixels and returns the percentage of different pixels; 0 for success,
   // [0, 100] for failure.
   double CompareWithResult(const std::wstring& verification_name) {
     FilePath test_result(ScanFiles(verification_name));
     if (test_result.value().empty()) {
       // 100% different, the print job buffer is not there.
       return 100.;
     }
 
-    std::wstring verification_file(test_data_directory_.ToWStringHack());
+    std::wstring verification_file(test_data_directory_.value());
     file_util::AppendToPath(&verification_file, L"printing");
     file_util::AppendToPath(&verification_file, verification_name);
     FilePath emf(verification_file + L".emf");
     FilePath png(verification_file + L".png");
 
     // Looks for Cleartype override.
     if (file_util::PathExists(
             FilePath::FromWStringHack(verification_file + L"_cleartype.png")) &&
         IsClearTypeEnabled()) {
       png = FilePath(verification_file + L"_cleartype.png");
@@ skipping 63 matching lines @@
     std::wstring prn_file;
     bool found_emf = false;
     bool found_prn = false;
     for (int i = 0; i < 100; ++i) {
       file_util::FileEnumerator enumerator(emf_path(), false,
           file_util::FileEnumerator::FILES);
       emf_file.clear();
       prn_file.clear();
       found_emf = false;
       found_prn = false;
-      std::wstring file;
-      while (!(file = enumerator.Next().ToWStringHack()).empty()) {
-        std::wstring ext = FilePath(file).Extension();
+      FilePath file;
+      while (!(file = enumerator.Next()).empty()) {
+        std::wstring ext = file.Extension();
         if (base::strcasecmp(WideToUTF8(ext).c_str(), ".emf") == 0) {
           EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" <<
-              emf_file << "\" and \"" << file << "\" when looking for \"" <<
-              verification_name << "\"";
+              emf_file << "\" and \"" << file.value() <<
+              "\" when looking for \"" << verification_name << "\"";
           found_emf = true;
-          emf_file = file;
+          emf_file = file.value();
           continue;
         }
         if (base::strcasecmp(WideToUTF8(ext).c_str(), ".prn") == 0) {
           EXPECT_FALSE(found_prn) << "Found a leftover .PRN file: \"" <<
-              prn_file << "\" and \"" << file << "\" when looking for \"" <<
-              verification_name << "\"";
-          prn_file = file;
+              prn_file << "\" and \"" << file.value() <<
+              "\" when looking for \"" << verification_name << "\"";
+          prn_file = file.value();
           found_prn = true;
           file_util::Delete(file, false);
           continue;
         }
         EXPECT_TRUE(false);
       }
       if (found_emf && found_prn)
         break;
       base::PlatformThread::Sleep(100);
     }
@@ skipping 245 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = test_server.GetURL("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }