Decouple FileSystem and WebSQL callbacks from VoidCallback and it non-refcounted

Source/modules/filesystem/DOMFileSystemBase.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 class DirectoryEntry;
 class DirectoryReaderBase;
 class EntriesCallback;
 class EntryBase;
 class EntryCallback;
 class ErrorCallback;
 class FileError;
 class MetadataCallback;
 class ExecutionContext;
 class SecurityOrigin;
-class VoidCallback;
+class FileSystemVoidCallback;
 
 // A common base class for DOMFileSystem and DOMFileSystemSync.
 class DOMFileSystemBase : public RefCounted<DOMFileSystemBase> {
 public:
     enum SynchronousType {
         Synchronous,
         Asynchronous,
     };
 
     // Path prefixes that are used in the filesystem URLs (that can be obtained by toURL()).
@@ skipping 32 matching lines @@
     bool supportsToURL() const;
     KURL createFileSystemURL(const EntryBase*) const;
     KURL createFileSystemURL(const String& fullPath) const;
     static bool pathToAbsolutePath(FileSystemType, const EntryBase*, String path, String& absolutePath);
     static bool pathPrefixToFileSystemType(const String& pathPrefix, FileSystemType&);
 
     // Actual FileSystem API implementations. All the validity checks on virtual paths are done at this level.
     void getMetadata(const EntryBase*, PassRefPtr<MetadataCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
     void move(const EntryBase* source, EntryBase* parent, const String& name, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
     void copy(const EntryBase* source, EntryBase* parent, const String& name, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
-    void remove(const EntryBase*, PassRefPtr<VoidCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
-    void removeRecursively(const EntryBase*, PassRefPtr<VoidCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
+    void remove(const EntryBase*, PassRefPtr<FileSystemVoidCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
+    void removeRecursively(const EntryBase*, PassRefPtr<FileSystemVoidCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
     void getParent(const EntryBase*, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
     void getFile(const EntryBase*, const String& path, const FileSystemFlags&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
     void getDirectory(const EntryBase*, const String& path, const FileSystemFlags&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
     bool readDirectory(PassRefPtr<DirectoryReaderBase>, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, SynchronousType = Asynchronous);
 
 protected:
     DOMFileSystemBase(ExecutionContext*, const String& name, FileSystemType, const KURL& rootURL);
     friend class DOMFileSystemSync;
 
     ExecutionContext* m_context;
     String m_name;
     FileSystemType m_type;
     KURL m_filesystemRootURL;
     bool m_clonable;
 };
 
 inline bool operator==(const DOMFileSystemBase& a, const DOMFileSystemBase& b) { return a.name() == b.name() && a.type() == b.type() && a.rootURL() == b.rootURL(); }
 
 } // namespace WebCore
 
 #endif // DOMFileSystemBase_h