Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/file_system_operation.h

Index: webkit/fileapi/file_system_operation.h
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index f1b948f94a0edc2a39a3b4403238cd3921cd6673..ac9b3e5bb5171cd9c7d76184df1aec2ef695a249 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -51,9 +51,6 @@ class FileSystemOperation : public FileSystemOperationInterface {
   virtual ~FileSystemOperation();
 
   // FileSystemOperation overrides.
-  virtual void OpenFileSystem(const GURL& origin_url,
-                              fileapi::FileSystemType type,
-                              bool create) OVERRIDE;
   virtual void CreateFile(const GURL& path,
                           bool exclusive) OVERRIDE;
   virtual void CreateDirectory(const GURL& path,
@@ -80,15 +77,11 @@ class FileSystemOperation : public FileSystemOperationInterface {
       const GURL& path,
       int file_flags,
       base::ProcessHandle peer_handle) OVERRIDE;
+  virtual void Cancel(FileSystemCallbackDispatcher* cancel_dispatcher) OVERRIDE;
 
   // Synchronously gets the platform path for the given |path|.
   void SyncGetPlatformPath(const GURL& path, FilePath* platform_path);
 
-  // Try to cancel the current operation [we support cancelling write or
-  // truncate only].  Report failure for the current operation, then tell the
-  // passed-in operation to report success.
-  void Cancel(FileSystemOperation* cancel_operation);
-
  private:
   class ScopedQuotaUtilHelper;
 
@@ -137,11 +130,6 @@ class FileSystemOperation : public FileSystemOperationInterface {
                                quota::QuotaStatusCode status,
                                int64 usage, int64 quota);
 
-  // A callback used for OpenFileSystem.
-  void DidGetRootPath(bool success,
-                      const FilePath& path,
-                      const std::string& name);
-
   // Callback for CreateFile for |exclusive|=true cases.
   void DidEnsureFileExistsExclusive(base::PlatformFileError rv,
                                     bool created);
@@ -235,7 +223,6 @@ class FileSystemOperation : public FileSystemOperationInterface {
 #ifndef NDEBUG
   enum OperationType {
     kOperationNone,
-    kOperationOpenFileSystem,
     kOperationCreateFile,
     kOperationCreateDirectory,
     kOperationCopy,
@@ -271,7 +258,7 @@ class FileSystemOperation : public FileSystemOperationInterface {
   friend class FileWriterDelegate;
   scoped_ptr<FileWriterDelegate> file_writer_delegate_;
   scoped_ptr<net::URLRequest> blob_request_;
-  scoped_ptr<FileSystemOperation> cancel_operation_;
+  scoped_ptr<FileSystemCallbackDispatcher> cancel_dispatcher_;
 
   // Used only by OpenFile, in order to clone the file handle back to the
   // requesting process.