Monster FilePath patch!

chrome/plugin/chrome_plugin_host.cc

Index: chrome/plugin/chrome_plugin_host.cc
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index adf186017bde1c716c638681ba3d069e58589e60..0f0e2401d055dcade7a921aacd09c8413efe9c3c 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -5,6 +5,7 @@
 #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"
@@ -127,11 +128,11 @@ class PluginRequestHandlerProxy
     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);
@@ -475,7 +476,8 @@ CPError STDCALL CPR_AppendFileToUpload(CPRequest* request, const char* filepath,
 
   if (!length) length = kuint64max;
   std::wstring wfilepath(UTF8ToWide(filepath));
-  handler->AppendFileRangeToUpload(wfilepath, offset, length);
+  handler->AppendFileRangeToUpload(FilePath::FromWStringHack(wfilepath), offset,
+                                   length);
   return CPERR_SUCCESS;
 }