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

1 files changed, 6 insertions, 6 deletions

diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index 1438e20..0a41a13 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -65,19 +65,19 @@ void UploadDataStream::FillBuf() {
       if (!next_element_stream_.IsOpen()) {
         int flags = base::PLATFORM_FILE_OPEN |
                     base::PLATFORM_FILE_READ;
-        int rv = next_element_stream_.Open(
-            FilePath::FromWStringHack(element.file_path()), flags);
+        int rv = next_element_stream_.Open(element.file_path(), flags);
         // If the file does not exist, that's technically okay.. we'll just
         // upload an empty file.  This is for consistency with Mozilla.
-        DLOG_IF(WARNING, rv != OK) << "Failed to open \"" <<
-            element.file_path() << "\" for reading: " << rv;
+        DLOG_IF(WARNING, rv != OK) << "Failed to open \""
+                                   << element.file_path().value()
+                                   << "\" for reading: " << rv;
 
         next_element_remaining_ = 0;  // Default to reading nothing.
         if (rv == OK) {
           uint64 offset = element.file_range_offset();
           if (offset && next_element_stream_.Seek(FROM_BEGIN, offset) < 0) {
-            DLOG(WARNING) << "Failed to seek \"" << element.file_path() <<
-                "\" to offset: " << offset;
+            DLOG(WARNING) << "Failed to seek \"" << element.file_path().value()
+                          << "\" to offset: " << offset;
           } else {
             next_element_remaining_ = element.file_range_length();
           }