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

chrome/test/ui/ui_layout_test.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/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
@@ skipping 191 matching lines @@
   FilePath new_test_file_path(new_layout_test_dir_);
   new_test_file_path = new_test_file_path.AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(new_test_file_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 
   scoped_ptr<GURL> new_test_url;
   if (port != kNoHttpPort)
     new_test_url.reset(new GURL(
         StringPrintf("http://localhost:%d/", port) +
-        WideToUTF8(test_case_dir_.ToWStringHack()) +
+        UTF16ToUTF8(test_case_dir_.LossyDisplayName()) +
         "/" +
         test_case_file_name));
   else
     new_test_url.reset(new GURL(net::FilePathToFileURL(new_test_file_path)));
 
   // Runs the new layout test.
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(*new_test_url.get()));
   std::string escaped_value =
@@ skipping 41 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }