Revert 81028 - It broke LayoutTests/ fast/filesystem/op-copy.html on Windows Release and Debug.

More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where possible without WebKit API changes. The WebKit changes will happen in another CL. This is a resubmit of http://codereview.chromium.org/6767010/, which bounced dueto a recent checkin that required a merge. There are a few changes here thatweren't there [in file_system_operation_write_unittest.cc andfile_system_operation.cc], but they're pretty trivial build/test fixes.BUG=none TEST=noneReview URL: http://codereview.chromium.org/6813066

TBR=ericu@google.com
Review URL: http://codereview.chromium.org/6813072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81065 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/webkit/fileapi/webfilewriter_base.h b/webkit/fileapi/webfilewriter_base.h
index 15217dd..f47b383 100644
--- a/webkit/fileapi/webfilewriter_base.h
+++ b/webkit/fileapi/webfilewriter_base.h
@@ -5,10 +5,12 @@
 #ifndef WEBKIT_FILEAPI_WEBFILEWRITER_BASE_H_
 #define WEBKIT_FILEAPI_WEBFILEWRITER_BASE_H_
 
+#include "base/file_path.h"
 #include "base/platform_file.h"
-#include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriter.h"
 
+class GURL;
+
 namespace WebKit {
 class WebFileWriterClient;
 class WebString;
@@ -20,7 +22,7 @@ namespace fileapi {
 class WebFileWriterBase : public WebKit::WebFileWriter {
  public:
   WebFileWriterBase(
-      const GURL& path, WebKit::WebFileWriterClient* client);
+      const WebKit::WebString& path, WebKit::WebFileWriterClient* client);
   virtual ~WebFileWriterBase();
 
   // WebFileWriter implementation
@@ -32,8 +34,8 @@ class WebFileWriterBase : public WebKit::WebFileWriter {
   // Derived classes must provide these methods to asynchronously perform
   // the requested operation, and they must call the appropiate DidSomething
   // method upon completion and as progress is made in the Write case.
-  virtual void DoTruncate(const GURL& path, int64 offset) = 0;
-  virtual void DoWrite(const GURL& path, const GURL& blob_url,
+  virtual void DoTruncate(const FilePath& path, int64 offset) = 0;
+  virtual void DoWrite(const FilePath& path, const GURL& blob_url,
                        int64 offset) = 0;
   virtual void DoCancel() = 0;
 
@@ -56,7 +58,7 @@ class WebFileWriterBase : public WebKit::WebFileWriter {
 
   void FinishCancel();
 
-  GURL path_;
+  FilePath path_;
   WebKit::WebFileWriterClient* client_;
   OperationType operation_;
   CancelState cancel_state_;