Monster FilePath patch!

chrome/browser/automation/url_request_mock_http_job.cc

 // Copyright (c) 2006-2008 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/automation/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
@@ skipping 14 matching lines @@
   // Fix up the url to be the file url we're loading from disk.
   std::string host_prefix("http://");
   host_prefix.append(kMockHostname);
   size_t host_prefix_len = host_prefix.length();
   if (url.compare(0, host_prefix_len, host_prefix.data(),
                   host_prefix_len) == 0) {
     file_url += UTF8ToWide(url.substr(host_prefix_len));
   }
 
   // Convert the file:/// URL to a path on disk.
-  std::wstring file_path;
+  FilePath file_path;
   net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
-  return new URLRequestMockHTTPJob(request,
-                                   FilePath::FromWStringHack(file_path));
+  return new URLRequestMockHTTPJob(request, file_path);
 }
 
 /* static */
 void URLRequestMockHTTPJob::AddUITestUrls(const std::wstring& base_path) {
   base_path_ = base_path;
 
   // Add kMockHostname to URLRequestFilter.
   URLRequestFilter* filter = URLRequestFilter::GetInstance();
   filter->AddHostnameHandler("http", kMockHostname,
                              URLRequestMockHTTPJob::Factory);
@@ skipping 35 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);
 }