2nd try: FileAPI: Split recursive remove into multiple tasks.

webkit/fileapi/file_system_file_util_proxy.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_FILE_UTIL_PROXY_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/files/file_util_proxy.h"
@@ skipping 23 matching lines @@
   typedef FileSystemOperation::GetMetadataCallback GetFileInfoCallback;
   typedef FileSystemOperation::ReadDirectoryCallback ReadDirectoryCallback;
 
   typedef base::Callback<
       void(base::PlatformFileError result,
            const base::PlatformFileInfo& file_info,
            const FilePath& platform_path,
            FileSystemFileUtil::SnapshotFilePolicy snapshot_policy)>
       SnapshotFileCallback;
 
-  // Deletes a file or a directory on the given context's task_runner.
-  // It is an error to delete a non-empty directory with recursive=false.
-  static bool Delete(
+  // Deletes a file on the given context's task_runner.
+  static bool DeleteFile(
       FileSystemOperationContext* context,
       FileSystemFileUtil* file_util,
       const FileSystemURL& url,
-      bool recursive,
+      const StatusCallback& callback);
+
+  // Deletes a directory on the given context's task_runner.
+  static bool DeleteDirectory(
+      FileSystemOperationContext* context,
+      FileSystemFileUtil* file_util,
+      const FileSystemURL& url,
       const StatusCallback& callback);
 
   // Creates or opens a file with the given flags by calling |file_util|'s
   // CreateOrOpen method on the given context's task_runner.
   static bool CreateOrOpen(
       FileSystemOperationContext* context,
       FileSystemFileUtil* file_util,
       const FileSystemURL& url,
       int file_flags,
       const CreateOrOpenCallback& callback);
@@ skipping 106 matching lines @@
       int64 length,
       const StatusCallback& callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileSystemFileUtilProxy);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_