Make FileSystemOperation::Write take closure-friendly parameters

webkit/browser/fileapi/local_file_system_operation.h

 // Copyright (c) 2012 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_BROWSER_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_BROWSER_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_writer_delegate.h"
 #include "webkit/common/blob/scoped_file.h"
 #include "webkit/common/quota/quota_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
-namespace chromeos {
-class CrosMountPointProvider;
-}
-
-namespace sync_file_system {
-class SyncableFileSystemOperation;
-}
-
 namespace fileapi {
 
 class AsyncFileUtil;
 class FileSystemContext;
 class RecursiveOperationDelegate;
 
 // FileSystemOperation implementation for local file systems.
 class WEBKIT_STORAGE_EXPORT LocalFileSystemOperation
     : public NON_EXPORTED_BASE(FileSystemOperation),
       public base::SupportsWeakPtr<LocalFileSystemOperation> {
@@ skipping 26 matching lines @@
   virtual void DirectoryExists(const FileSystemURL& url,
                                const StatusCallback& callback) OVERRIDE;
   virtual void FileExists(const FileSystemURL& url,
                           const StatusCallback& callback) OVERRIDE;
   virtual void GetMetadata(const FileSystemURL& url,
                            const GetMetadataCallback& callback) OVERRIDE;
   virtual void ReadDirectory(const FileSystemURL& url,
                              const ReadDirectoryCallback& callback) OVERRIDE;
   virtual void Remove(const FileSystemURL& url, bool recursive,
                       const StatusCallback& callback) OVERRIDE;
-  virtual void Write(const net::URLRequestContext* url_request_context,
-                     const FileSystemURL& url,
-                     const GURL& blob_url,
-                     int64 offset,
+  virtual void Write(const FileSystemURL& url,
+                     scoped_ptr<FileWriterDelegate> writer_delegate,
+                     scoped_ptr<net::URLRequest> blob_request,
                      const WriteCallback& callback) OVERRIDE;
   virtual void Truncate(const FileSystemURL& url, int64 length,
                         const StatusCallback& callback) OVERRIDE;
   virtual void TouchFile(const FileSystemURL& url,
                          const base::Time& last_access_time,
                          const base::Time& last_modified_time,
                          const StatusCallback& callback) OVERRIDE;
   virtual void OpenFile(const FileSystemURL& url,
                         int file_flags,
                         base::ProcessHandle peer_handle,
@@ skipping 72 matching lines @@
                      const StatusCallback& callback);
 
   // Synchronously gets the platform path for the given |url|.
   void SyncGetPlatformPath(const FileSystemURL& url,
                            base::FilePath* platform_path);
 
   FileSystemContext* file_system_context() const {
     return file_system_context_.get();
   }
 
- private:
-  friend class sync_file_system::SyncableFileSystemOperation;
-
+ protected:
   // Queries the quota and usage and then runs the given |task|.
   // If an error occurs during the quota query it runs |error_callback| instead.
   void GetUsageAndQuotaThenRunTask(
       const FileSystemURL& url,
       const base::Closure& task,
       const base::Closure& error_callback);
 
   // Called after the quota info is obtained from the quota manager
   // (which is triggered by GetUsageAndQuotaThenRunTask).
   // Sets the quota info in the operation_context_ and then runs the given
   // |task| if the returned quota status is successful, otherwise runs
   // |error_callback|.
   void DidGetUsageAndQuotaAndRunTask(
       const base::Closure& task,
       const base::Closure& error_callback,
       quota::QuotaStatusCode status,
       int64 usage, int64 quota);
 
-  // returns a closure which actually perform the write operation.
-  base::Closure GetWriteClosure(
-      const net::URLRequestContext* url_request_context,
-      const FileSystemURL& url,
-      const GURL& blob_url,
-      int64 offset,
-      const WriteCallback& callback);
-  void DidFailWrite(
-      const WriteCallback& callback,
-      base::PlatformFileError result);
-
   // The 'body' methods that perform the actual work (i.e. posting the
   // file task on proxy_) after the quota check.
   void DoCreateFile(const FileSystemURL& url,
                     const StatusCallback& callback, bool exclusive);
   void DoCreateDirectory(const FileSystemURL& url,
                          const StatusCallback& callback,
                          bool exclusive,
                          bool recursive);
   void DoCopyFileLocal(const FileSystemURL& src,
                        const FileSystemURL& dest,
@@ skipping 59 matching lines @@
 
   // A flag to make sure we call operation only once per instance.
   OperationType pending_operation_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemOperation);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_BROWSER_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_