Monster FilePath patch!

chrome/plugin/chrome_plugin_host.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 "chrome/plugin/chrome_plugin_host.h"
 
 #include "base/command_line.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
@@ skipping 102 matching lines @@
     load_flags_ = flags;
   }
   void set_sync(bool sync) {
     sync_ = sync;
   }
   void AppendDataToUpload(const char* bytes, int bytes_len) {
     upload_content_.push_back(net::UploadData::Element());
     upload_content_.back().SetToBytes(bytes, bytes_len);
   }
 
-  void AppendFileToUpload(const std::wstring &filepath) {
+  void AppendFileToUpload(const FilePath &filepath) {
     AppendFileRangeToUpload(filepath, 0, kuint64max);
   }
 
-  void AppendFileRangeToUpload(const std::wstring &filepath,
+  void AppendFileRangeToUpload(const FilePath &filepath,
                                uint64 offset, uint64 length) {
     upload_content_.push_back(net::UploadData::Element());
     upload_content_.back().SetToFilePathRange(filepath, offset, length);
   }
 
   CPError Start() {
     bridge_.reset(
         PluginThread::current()->resource_dispatcher()->CreateBridge(
             cprequest_->method,
             GURL(cprequest_->url),
@@ skipping 323 matching lines @@
 
 CPError STDCALL CPR_AppendFileToUpload(CPRequest* request, const char* filepath,
                                        uint64 offset, uint64 length) {
   CHECK(ChromePluginLib::IsPluginThread());
   PluginRequestHandlerProxy* handler =
       PluginRequestHandlerProxy::FromCPRequest(request);
   CHECK(handler);
 
   if (!length) length = kuint64max;
   std::wstring wfilepath(UTF8ToWide(filepath));
-  handler->AppendFileRangeToUpload(wfilepath, offset, length);
+  handler->AppendFileRangeToUpload(FilePath::FromWStringHack(wfilepath), offset,
+                                   length);
   return CPERR_SUCCESS;
 }
 
 int STDCALL CPR_GetResponseInfo(CPRequest* request, CPResponseInfoType type,
                                 void* buf, uint32 buf_size) {
   CHECK(ChromePluginLib::IsPluginThread());
   PluginRequestHandlerProxy* handler =
       PluginRequestHandlerProxy::FromCPRequest(request);
   CHECK(handler);
   return handler->GetResponseInfo(type, buf, buf_size);
@@ skipping 122 matching lines @@
 
     response_funcs.size = sizeof(response_funcs);
     response_funcs.received_redirect = CPRR_ReceivedRedirect;
     response_funcs.start_completed = CPRR_StartCompleted;
     response_funcs.read_completed = CPRR_ReadCompleted;
     response_funcs.upload_progress = CPRR_UploadProgress;
   }
 
   return &browser_funcs;
 }