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, 3 insertions, 2 deletions

diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc
index cf30f7e3..655eb0f 100644
--- a/webkit/glue/weburlrequest_impl.cc
+++ b/webkit/glue/weburlrequest_impl.cc
@@ -172,7 +172,8 @@ void WebRequestImpl::GetUploadData(net::UploadData* data) const {
     if (element.m_type == WebCore::FormDataElement::data) {
       data->AppendBytes(element.m_data.data(), element.m_data.size());
     } else if (element.m_type == WebCore::FormDataElement::encodedFile) {
-      data->AppendFile(webkit_glue::StringToStdWString(element.m_filename));
+      data->AppendFile(
+          FilePath(webkit_glue::StringToFilePathString(element.m_filename)));
     } else {
       NOTREACHED();
     }
@@ -195,7 +196,7 @@ void WebRequestImpl::SetUploadData(const net::UploadData& data)
           element.bytes().size());
     } else if (element.type() == net::UploadData::TYPE_FILE) {
       formdata->appendFile(
-          webkit_glue::StdWStringToString(element.file_path()));
+          webkit_glue::FilePathStringToString(element.file_path().value()));
     } else {
       NOTREACHED();
     }