More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where

webkit/fileapi/file_system_operation.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 39 matching lines @@
   // the class.  It's expecting a pointer to a singleton.
   FileSystemOperation(FileSystemCallbackDispatcher* dispatcher,
                       scoped_refptr<base::MessageLoopProxy> proxy,
                       FileSystemContext* file_system_context,
                       FileSystemFileUtil* file_system_file_util);
   virtual ~FileSystemOperation();
 
   void OpenFileSystem(const GURL& origin_url,
                       fileapi::FileSystemType type,
                       bool create);
-  void CreateFile(const FilePath& path,
+  void CreateFile(const GURL& path,
                   bool exclusive);
-  void CreateDirectory(const FilePath& path,
+  void CreateDirectory(const GURL& path,
                        bool exclusive,
                        bool recursive);
-  void Copy(const FilePath& src_path,
-            const FilePath& dest_path);
-  void Move(const FilePath& src_path,
-            const FilePath& dest_path);
-  void DirectoryExists(const FilePath& path);
-  void FileExists(const FilePath& path);
-  void GetMetadata(const FilePath& path);
-  void ReadDirectory(const FilePath& path);
-  void Remove(const FilePath& path, bool recursive);
+  void Copy(const GURL& src_path,
+            const GURL& dest_path);
+  void Move(const GURL& src_path,
+            const GURL& dest_path);
+  void DirectoryExists(const GURL& path);
+  void FileExists(const GURL& path);
+  void GetMetadata(const GURL& path);
+  void ReadDirectory(const GURL& path);
+  void Remove(const GURL& path, bool recursive);
   void Write(scoped_refptr<net::URLRequestContext> url_request_context,
-             const FilePath& path,
+             const GURL& path,
              const GURL& blob_url,
              int64 offset);
-  void Truncate(const FilePath& path, int64 length);
-  void TouchFile(const FilePath& path,
+  void Truncate(const GURL& path, int64 length);
+  void TouchFile(const GURL& path,
                  const base::Time& last_access_time,
                  const base::Time& last_modified_time);
 
   // Try to cancel the current operation [we support cancelling write or
   // truncate only].  Report failure for the current operation, then tell the
   // passed-in operation to report success.
   void Cancel(FileSystemOperation* cancel_operation);
 
  private:
   FileSystemContext* file_system_context() const {
@@ skipping 46 matching lines @@
       base::PassPlatformFile file,
       bool created);
 
   // Checks the validity of a given |path| for reading, and cracks the path into
   // root URL and virtual path components.
   // Returns true if the given |path| is a valid FileSystem path.
   // Otherwise it calls dispatcher's DidFail method with
   // PLATFORM_FILE_ERROR_SECURITY and returns false.
   // (Note: this doesn't delete this when it calls DidFail and returns false;
   // it's the caller's responsibility.)
-  bool VerifyFileSystemPathForRead(const FilePath& path,
+  bool VerifyFileSystemPathForRead(const GURL& path,
                                    GURL* root_url,
                                    FileSystemType* type,
                                    FilePath* virtual_path);
 
   // Checks the validity of a given |path| for writing, and cracks the path into
   // root URL and virtual path components.
   // Returns true if the given |path| is a valid FileSystem path, and
   // its origin embedded in the path has the right to write.
   // Otherwise it fires dispatcher's DidFail method with
   // PLATFORM_FILE_ERROR_SECURITY if the path is not valid for writing,
   // or with PLATFORM_FILE_ERROR_NO_SPACE if the origin is not allowed to
   // write to the storage.
   // In either case it returns false after firing DidFail.
   // If |create| flag is true this also checks if the |path| contains
   // any restricted names and chars. If it does, the call fires dispatcher's
   // DidFail with PLATFORM_FILE_ERROR_SECURITY and returns false.
   // (Note: this doesn't delete this when it calls DidFail and returns false;
   // it's the caller's responsibility.)
-  bool VerifyFileSystemPathForWrite(const FilePath& path,
+  bool VerifyFileSystemPathForWrite(const GURL& path,
                                     bool create,
                                     GURL* root_url,
                                     FileSystemType* type,
                                     FilePath* virtual_path);
 
 #ifndef NDEBUG
   enum OperationType {
     kOperationNone,
     kOperationOpenFileSystem,
     kOperationCreateFile,
@@ skipping 29 matching lines @@
   scoped_ptr<FileWriterDelegate> file_writer_delegate_;
   scoped_ptr<net::URLRequest> blob_request_;
   scoped_ptr<FileSystemOperation> cancel_operation_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperation);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_