Cleanup: Deprecate FileSystemCallbackDispatcher

content/common/fileapi/file_system_dispatcher.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 CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
 #define CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback_forward.h"
 #include "base/files/file_util_proxy.h"
 #include "base/id_map.h"
 #include "base/process.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_platform_file.h"
-#include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/quota_types.h"
 
 namespace base {
 class FilePath;
 struct PlatformFileInfo;
 }
 
 class GURL;
 
 namespace content {
 
 // Dispatches and sends file system related messages sent to/from a child
 // process from/to the main browser process.  There is one instance
 // per child process.  Messages are dispatched on the main child thread.
 class FileSystemDispatcher : public IPC::Listener {
  public:
+  typedef base::Callback<void(base::PlatformFileError error)> StatusCallback;
+  typedef base::Callback<void(
+      const base::PlatformFileInfo& file_info,
+      const base::FilePath& platform_path)> MetadataCallback;
+  typedef MetadataCallback CreateSnapshotFileCallback;
+  typedef base::Callback<void(
+      const std::vector<base::FileUtilProxy::Entry>& entries,
+      bool has_more)> ReadDirectoryCallback;
+  typedef base::Callback<void(
+      const std::string& name,
+      const GURL& root)> OpenFileSystemCallback;
+  typedef base::Callback<void(
+      int64 bytes,
+      bool complete)> WriteCallback;
+  typedef base::Callback<void(
+      base::PlatformFile file,
+      int file_open_id,
+      quota::QuotaLimitType quota_policy)> OpenFileCallback;
+
   FileSystemDispatcher();
   virtual ~FileSystemDispatcher();
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   bool OpenFileSystem(const GURL& origin_url,
                       fileapi::FileSystemType type,
                       long long size,
                       bool create,
-                      fileapi::FileSystemCallbackDispatcher* dispatcher);
+                      const OpenFileSystemCallback& success_callback,
+                      const StatusCallback& error_callback);
   bool DeleteFileSystem(const GURL& origin_url,
                         fileapi::FileSystemType type,
-                        fileapi::FileSystemCallbackDispatcher* dispatcher);
+                        const StatusCallback& callback);
   bool Move(const GURL& src_path,
             const GURL& dest_path,
-            fileapi::FileSystemCallbackDispatcher* dispatcher);
+            const StatusCallback& callback);
   bool Copy(const GURL& src_path,
             const GURL& dest_path,
-            fileapi::FileSystemCallbackDispatcher* dispatcher);
+            const StatusCallback& callback);
   bool Remove(const GURL& path,
               bool recursive,
-              fileapi::FileSystemCallbackDispatcher* dispatcher);
+              const StatusCallback& callback);
   bool ReadMetadata(const GURL& path,
-                    fileapi::FileSystemCallbackDispatcher* dispatcher);
+                    const MetadataCallback& success_callback,
+                    const StatusCallback& error_callback);
   bool Create(const GURL& path,
               bool exclusive,
               bool is_directory,
               bool recursive,
-              fileapi::FileSystemCallbackDispatcher* dispatcher);
+              const StatusCallback& callback);
   bool Exists(const GURL& path,
               bool for_directory,
-              fileapi::FileSystemCallbackDispatcher* dispatcher);
+              const StatusCallback& callback);
   bool ReadDirectory(const GURL& path,
-                     fileapi::FileSystemCallbackDispatcher* dispatcher);
+                     const ReadDirectoryCallback& success_callback,
+                     const StatusCallback& error_callback);
   bool Truncate(const GURL& path,
                 int64 offset,
                 int* request_id_out,
-                fileapi::FileSystemCallbackDispatcher* dispatcher);
+                const StatusCallback& callback);
   bool Write(const GURL& path,
              const GURL& blob_url,
              int64 offset,
              int* request_id_out,
-             fileapi::FileSystemCallbackDispatcher* dispatcher);
+             const WriteCallback& success_callback,
+             const StatusCallback& error_callback);
   bool Cancel(int request_id_to_cancel,
-              fileapi::FileSystemCallbackDispatcher* dispatcher);
+              const StatusCallback& callback);
   bool TouchFile(const GURL& file_path,
                  const base::Time& last_access_time,
                  const base::Time& last_modified_time,
-                 fileapi::FileSystemCallbackDispatcher* dispatcher);
+                 const StatusCallback& callback);
 
   // This returns a raw open PlatformFile, unlike the above, which are
   // self-contained operations.
   bool OpenFile(const GURL& file_path,
                 int file_flags,  // passed to FileUtilProxy::CreateOrOpen
-                fileapi::FileSystemCallbackDispatcher* dispatcher);
+                const OpenFileCallback& success_callback,
+                const StatusCallback& error_callback);
   // This must be paired with OpenFile, and called after finished using the
   // raw PlatformFile returned from OpenFile.
   bool NotifyCloseFile(int file_open_id);
 
   bool CreateSnapshotFile(const GURL& file_path,
-                          fileapi::FileSystemCallbackDispatcher* dispatcher);
+                          const CreateSnapshotFileCallback& success_callback,
+                          const StatusCallback& error_callback);
 
  private:
+  class CallbackDispatcher;
+
   // Message handlers.
   void OnDidOpenFileSystem(int request_id,
                            const std::string& name,
                            const GURL& root);
   void OnDidSucceed(int request_id);
   void OnDidReadMetadata(int request_id,
                          const base::PlatformFileInfo& file_info,
                          const base::FilePath& platform_path);
   void OnDidCreateSnapshotFile(int request_id,
                                const base::PlatformFileInfo& file_info,
                                const base::FilePath& platform_path);
   void OnDidReadDirectory(
       int request_id,
       const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more);
   void OnDidFail(int request_id, base::PlatformFileError error_code);
   void OnDidWrite(int request_id, int64 bytes, bool complete);
   void OnDidOpenFile(
       int request_id,
       IPC::PlatformFileForTransit file,
       int file_open_id,
       quota::QuotaLimitType quota_policy);
 
-  IDMap<fileapi::FileSystemCallbackDispatcher, IDMapOwnPointer> dispatchers_;
+  IDMap<CallbackDispatcher, IDMapOwnPointer> dispatchers_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_