Switching things to FilePath:

Remove following deprecated wstring-using functions:

net/net_util: FilePathToFileURL
net/net_util: FileURLToFilePath

Switch net/base/upload_data to FilePath.
Switch upload-related parts of net/url_request/url_request to FilePath.

Made necessary adjustments in rest of code (a lot).

Review URL: http://codereview.chromium.org/63011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13242 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 5 deletions

diff --git a/chrome/browser/automation/url_request_mock_http_job.cc b/chrome/browser/automation/url_request_mock_http_job.cc
index 26a5cc7..4bb191a 100644
--- a/chrome/browser/automation/url_request_mock_http_job.cc
+++ b/chrome/browser/automation/url_request_mock_http_job.cc
@@ -32,10 +32,9 @@ URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
   }
 
   // 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 */
diff --git a/chrome/browser/automation/url_request_mock_net_error_job.cc b/chrome/browser/automation/url_request_mock_net_error_job.cc
index e6ab51f..0b9a20a 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.cc
+++ b/chrome/browser/automation/url_request_mock_net_error_job.cc
@@ -54,11 +54,11 @@ URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
   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,