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, 6 insertions, 6 deletions

diff --git a/webkit/tools/test_shell/simple_file_writer.cc b/webkit/tools/test_shell/simple_file_writer.cc
index 657d247..9304978 100644
--- a/webkit/tools/test_shell/simple_file_writer.cc
+++ b/webkit/tools/test_shell/simple_file_writer.cc
@@ -45,7 +45,7 @@ class SimpleFileWriter::IOThreadProxy
   virtual ~IOThreadProxy() {
   }
 
-  void Truncate(const GURL& path, int64 offset) {
+  void Truncate(const FilePath& path, int64 offset) {
     if (!io_thread_->BelongsToCurrentThread()) {
       io_thread_->PostTask(FROM_HERE, NewRunnableMethod(
           this, &IOThreadProxy::Truncate, path, offset));
@@ -56,7 +56,7 @@ class SimpleFileWriter::IOThreadProxy
     operation_->Truncate(path, offset);
   }
 
-  void Write(const GURL& path, const GURL& blob_url, int64 offset) {
+  void Write(const FilePath& path, const GURL& blob_url, int64 offset) {
     if (!io_thread_->BelongsToCurrentThread()) {
       io_thread_->PostTask(FROM_HERE, NewRunnableMethod(
           this, &IOThreadProxy::Write, path, blob_url, offset));
@@ -118,7 +118,7 @@ class SimpleFileWriter::IOThreadProxy
 
     virtual void DidOpenFileSystem(
         const std::string& name,
-        const GURL& root) {
+        const FilePath& root_path) {
       NOTREACHED();
     }
 
@@ -181,7 +181,7 @@ class SimpleFileWriter::IOThreadProxy
 
 
 SimpleFileWriter::SimpleFileWriter(
-    const GURL& path,
+    const WebString& path,
     WebFileWriterClient* client,
     FileSystemContext* file_system_context)
   : WebFileWriterBase(path, client),
@@ -191,12 +191,12 @@ SimpleFileWriter::SimpleFileWriter(
 SimpleFileWriter::~SimpleFileWriter() {
 }
 
-void SimpleFileWriter::DoTruncate(const GURL& path, int64 offset) {
+void SimpleFileWriter::DoTruncate(const FilePath& path, int64 offset) {
   io_thread_proxy_->Truncate(path, offset);
 }
 
 void SimpleFileWriter::DoWrite(
-    const GURL& path, const GURL& blob_url, int64 offset) {
+    const FilePath& path, const GURL& blob_url, int64 offset) {
   io_thread_proxy_->Write(path, blob_url, offset);
 }