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

webkit/tools/test_shell/simple_file_system.h

Index: webkit/tools/test_shell/simple_file_system.h
===================================================================
--- webkit/tools/test_shell/simple_file_system.h	(revision 121622)
+++ webkit/tools/test_shell/simple_file_system.h	(working copy)
@@ -10,8 +10,6 @@
 #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>
 
@@ -23,6 +21,7 @@
 
 namespace fileapi {
 class FileSystemContext;
+class FileSystemOperationInterface;
 }
 
 class SimpleFileSystem
@@ -83,32 +82,8 @@
  private:
   // Helpers.
   fileapi::FileSystemOperationInterface* GetNewOperation(
-      const WebKit::WebURL& path);
+      const WebKit::WebURL& path, WebKit::WebFileSystemCallbacks* callbacks);
 
-  // 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);
-
   // A temporary directory for FileSystem API.
   ScopedTempDir file_system_dir_;