Monster FilePath patch!

chrome/browser/automation/url_request_mock_net_error_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_net_error_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
@@ skipping 36 matching lines @@
 
   MockInfo mock_info = iter->second;
 
   // URLRequestMockNetErrorJob derives from URLRequestFileJob.  We pass a
   // FilePath so that the URLRequestFileJob methods will do the loading from
   // the files.
   std::wstring file_url(L"file:///");
   file_url.append(mock_info.base);
   file_url.append(UTF8ToWide(url.path()));
   // 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 URLRequestMockNetErrorJob(request, mock_info.errors,
                                        mock_info.ssl_cert,
-                                       FilePath::FromWStringHack(file_path));
+                                       file_path);
 }
 
 URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(URLRequest* request,
     const std::vector<int>& errors, net::X509Certificate* cert,
     const FilePath& file_path)
     : URLRequestMockHTTPJob(request, file_path),
       errors_(errors),
       ssl_cert_(cert) {
 }
 
@@ skipping 18 matching lines @@
                                                   ssl_cert_.get());
     } else {
       NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, error));
     }
   }
 }
 
 void URLRequestMockNetErrorJob::ContinueDespiteLastError() {
   Start();
 }