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

chrome/browser/net/url_request_mock_http_job.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 "chrome/browser/net/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 24 matching lines @@
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameHandler("http", kMockHostname,
                              URLRequestMockHTTPJob::Factory);
 }
 
 /* static */
 GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
-  url.append(WideToUTF8(path.ToWStringHack()));
+  url.append(UTF16ToUTF8(path.LossyDisplayName()));
   return GURL(url);
 }
 
 /* static */
 GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) {
   std::string url = chrome::kViewSourceScheme;
   url.append(":");
   url.append(GetMockUrl(path).spec());
   return GURL(url);
 }
 
 /* static */
 FilePath URLRequestMockHTTPJob::GetOnDiskPath(const FilePath& base_path,
                                               net::URLRequest* request,
                                               const std::string& scheme) {
   std::string file_url("file:///");
-  file_url += WideToUTF8(base_path.ToWStringHack());
+  file_url + UTF16ToUTF8(base_path.LossyDisplayName());
   file_url += request->url().path();
 
   // Convert the file:/// URL to a path on disk.
   FilePath file_path;
   net::FileURLToFilePath(GURL(file_url), &file_path);
   return file_path;
 }
 
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(net::URLRequest* request,
                                              const FilePath& file_path)
@@ skipping 33 matching lines @@
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
   return info.headers && info.headers->GetMimeType(mime_type);
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }