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

webkit/tools/test_shell/simple_file_system.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_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 
 #include "base/file_util_proxy.h"
 #include "base/id_map.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
-#include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_operation_interface.h"
 #include "webkit/fileapi/file_system_types.h"
 #include <vector>
 
 namespace WebKit {
 class WebFileSystemCallbacks;
 class WebFrame;
 class WebURL;
 }
 
 namespace fileapi {
 class FileSystemContext;
+class FileSystemOperationInterface;
 }
 
 class SimpleFileSystem
     : public WebKit::WebFileSystem,
       public base::SupportsWeakPtr<SimpleFileSystem> {
  public:
   SimpleFileSystem();
   virtual ~SimpleFileSystem();
 
   void OpenFileSystem(WebKit::WebFrame* frame,
@@ skipping 40 matching lines @@
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void readDirectory(
       const WebKit::WebURL& path,
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual WebKit::WebFileWriter* createFileWriter(
       const WebKit::WebURL& path, WebKit::WebFileWriterClient*) OVERRIDE;
 
  private:
   // Helpers.
   fileapi::FileSystemOperationInterface* GetNewOperation(
-      const WebKit::WebURL& path);
-
-  // Callback Handlers
-  fileapi::FileSystemOperationInterface::StatusCallback FinishHandler(
-      WebKit::WebFileSystemCallbacks* callbacks);
-  fileapi::FileSystemOperationInterface::GetMetadataCallback GetMetadataHandler(
-      WebKit::WebFileSystemCallbacks* callbacks);
-  fileapi::FileSystemOperationInterface::ReadDirectoryCallback
-      ReadDirectoryHandler(WebKit::WebFileSystemCallbacks* callbacks);
-  fileapi::FileSystemContext::OpenFileSystemCallback OpenFileSystemHandler(
-      WebKit::WebFileSystemCallbacks* callbacks);
-  void DidFinish(WebKit::WebFileSystemCallbacks* callbacks,
-                 base::PlatformFileError result);
-  void DidGetMetadata(WebKit::WebFileSystemCallbacks* callbacks,
-                      base::PlatformFileError result,
-                      const base::PlatformFileInfo& info,
-                      const FilePath& platform_path);
-  void DidReadDirectory(
-      WebKit::WebFileSystemCallbacks* callbacks,
-      base::PlatformFileError result,
-      const std::vector<base::FileUtilProxy::Entry>& entries,
-      bool has_more);
-  void DidOpenFileSystem(WebKit::WebFileSystemCallbacks* callbacks,
-                         base::PlatformFileError result,
-                         const std::string& name, const GURL& root);
+      const WebKit::WebURL& path, WebKit::WebFileSystemCallbacks* callbacks);
 
   // A temporary directory for FileSystem API.
   ScopedTempDir file_system_dir_;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFileSystem);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_