Clean up some net/ code. Change a number of wstrings to FilePaths.

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

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

3 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/automation/url_request_mock_http_job.cc b/chrome/browser/automation/url_request_mock_http_job.cc
index 3a3c7d9..9f2ccfc 100644
--- a/chrome/browser/automation/url_request_mock_http_job.cc
+++ b/chrome/browser/automation/url_request_mock_http_job.cc
@@ -34,7 +34,7 @@ URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
   std::wstring file_path;
   net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
   URLRequestMockHTTPJob* job = new URLRequestMockHTTPJob(request);
-  job->file_path_ = file_path;
+  job->file_path_ = FilePath::FromWStringHack(file_path);
   return job;
 }
 
@@ -61,7 +61,7 @@ URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request)
     : URLRequestFileJob(request) { }
 
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
-  std::wstring header_file = file_path_ + kMockHeaderFileSuffix;
+  std::wstring header_file = file_path_.ToWStringHack() + kMockHeaderFileSuffix;
   std::string raw_headers;
   if (!file_util::ReadFileToString(header_file, &raw_headers))
     return;
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 1061942..1c67d29 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.cc
+++ b/chrome/browser/automation/url_request_mock_net_error_job.cc
@@ -59,7 +59,7 @@ URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
   // Convert the file:/// URL to a path on disk.
   std::wstring file_path;
   net::FileURLToFilePath(GURL(WideToUTF8(file_url)), &file_path);
-  job->file_path_ = file_path;
+  job->file_path_ = FilePath::FromWStringHack(file_path);
   return job;
 }
 
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 1102b87..b82506a 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -331,7 +331,8 @@ void URLRequestChromeJob::StartAsync() {
 URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request,
                                                  const std::wstring& path)
     : URLRequestFileJob(request) {
-  this->file_path_ = path;  // set URLRequestFileJob::file_path_
+  // set URLRequestFileJob::file_path_
+  this->file_path_ = FilePath::FromWStringHack(path);
 }
 
 URLRequestChromeFileJob::~URLRequestChromeFileJob() { }