Monster FilePath patch!

webkit/glue/weburlrequest_impl.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 "config.h"
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "FormData.h"
 #include "HTTPHeaderMap.h"
@@ skipping 154 matching lines @@
   if (!formdata)
     return;
 
   const Vector<WebCore::FormDataElement>& elements = formdata->elements();
   Vector<WebCore::FormDataElement>::const_iterator it = elements.begin();
   for (; it != elements.end(); ++it) {
     const WebCore::FormDataElement& element = (*it);
     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();
     }
   }
 
   data->set_identifier(formdata->identifier());
 }
 
 void WebRequestImpl::SetUploadData(const net::UploadData& data)
 {
   RefPtr<WebCore::FormData> formdata = WebCore::FormData::create();
 
   const std::vector<net::UploadData::Element>& elements = data.elements();
   std::vector<net::UploadData::Element>::const_iterator it = elements.begin();
   for (; it != elements.end(); ++it) {
     const net::UploadData::Element& element = (*it);
     if (element.type() == net::UploadData::TYPE_BYTES) {
       formdata->appendData(
           std::string(element.bytes().begin(), element.bytes().end()).c_str(),
           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();
     }
   }
 
   formdata->setIdentifier(data.identifier());
 
   request_.resourceRequest().setHTTPBody(formdata);
 }
 
 void WebRequestImpl::SetRequestorID(int requestor_id) {
   request_.resourceRequest().setRequestorID(requestor_id);
 }
 
 // static
 WebRequest* WebRequest::Create(const GURL& url) {
   return new WebRequestImpl(url);
 }