Revert 121620 - Refactor FileSystemOperation to take callback for each method.

webkit/fileapi/file_system_context.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_FILEAPI_FILE_SYSTEM_CONTEXT_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_CONTEXT_H_
 
-#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/special_storage_policy.h"
 
 class FilePath;
 class GURL;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace quota {
 class QuotaManagerProxy;
 }
 
 namespace fileapi {
 
 class ExternalFileSystemMountPointProvider;
+class FileSystemCallbackDispatcher;
+class FileSystemContext;
 class FileSystemFileUtil;
 class FileSystemMountPointProvider;
 class FileSystemOperationInterface;
 class FileSystemOptions;
 class FileSystemPathManager;
 class FileSystemQuotaUtil;
 class SandboxMountPointProvider;
 
 struct DefaultContextDeleter;
 
@@ skipping 40 matching lines @@
   // Returns a FileSystemMountPointProvider instance for sandboxed filesystem
   // types (e.g. TEMPORARY or PERSISTENT).  This is equivalent to calling
   // GetMountPointProvider(kFileSystemType{Temporary, Persistent}).
   SandboxMountPointProvider* sandbox_provider() const;
 
   // Returns a FileSystemMountPointProvider instance for external filesystem
   // type, which is used only by chromeos for now.  This is equivalent to
   // calling GetMountPointProvider(kFileSystemTypeExternal).
   ExternalFileSystemMountPointProvider* external_provider() const;
 
-  // Used for OpenFileSystem.
-  typedef base::Callback<void(base::PlatformFileError result,
-                              const std::string& name,
-                              const GURL& root)> OpenFileSystemCallback;
-
   // Opens the filesystem for the given |origin_url| and |type|, and dispatches
   // the DidOpenFileSystem callback of the given |dispatcher|.
   // If |create| is true this may actually set up a filesystem instance
   // (e.g. by creating the root directory or initializing the database
   // entry etc).
+  // TODO(kinuko): replace the dispatcher with a regular callback.
   void OpenFileSystem(
       const GURL& origin_url,
       FileSystemType type,
       bool create,
-      OpenFileSystemCallback callback);
+      scoped_ptr<FileSystemCallbackDispatcher> dispatcher);
 
   // Creates a new FileSystemOperation instance by cracking
   // the given filesystem URL |url| to get an appropriate MountPointProvider
   // and calling the provider's corresponding CreateFileSystemOperation method.
   // The resolved MountPointProvider could perform further specialization
   // depending on the filesystem type pointed by the |url|.
   FileSystemOperationInterface* CreateFileSystemOperation(
       const GURL& url,
+      scoped_ptr<FileSystemCallbackDispatcher> dispatcher,
       base::MessageLoopProxy* file_proxy);
 
  private:
   friend struct DefaultContextDeleter;
   void DeleteOnCorrectThread() const;
 
   scoped_refptr<base::MessageLoopProxy> file_message_loop_;
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
 
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
 
   // Mount point providers.
   scoped_ptr<SandboxMountPointProvider> sandbox_provider_;
   scoped_ptr<ExternalFileSystemMountPointProvider> external_provider_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileSystemContext);
 };
 
 struct DefaultContextDeleter {
   static void Destruct(const FileSystemContext* context) {
     context->DeleteOnCorrectThread();
   }
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_CONTEXT_H_