Reapply 61613 that was reverted for false valgrind alarm.

webkit/fileapi/file_system_operation.h

 // Copyright (c) 2010 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_OPERATION_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 27 matching lines @@
   void CreateFile(const FilePath& path,
                   bool exclusive);
 
   void CreateDirectory(const FilePath& path,
                        bool exclusive,
                        bool recursive);
 
   void Copy(const FilePath& src_path,
             const FilePath& dest_path);
 
-  // If |dest_path| exists and is a directory, behavior is unspecified or
-  // varies for different platforms. TODO(kkanetkar): Fix this as per spec
-  // when it is addressed in spec.
   void Move(const FilePath& src_path,
             const FilePath& dest_path);
 
   void DirectoryExists(const FilePath& path);
 
   void FileExists(const FilePath& path);
 
   void GetMetadata(const FilePath& path);
 
   void ReadDirectory(const FilePath& path);
 
-  void Remove(const FilePath& path);
+  void Remove(const FilePath& path, bool recursive);
 
   void Write(const FilePath& path, const GURL& blob_url, int64 offset);
 
   void Truncate(const FilePath& path, int64 length);
 
   void TouchFile(const FilePath& path,
                  const base::Time& last_access_time,
                  const base::Time& last_modified_time);
 
   // Try to cancel the current operation [we support cancelling write or
@@ skipping 64 matching lines @@
   // A flag to make sure we call operation only once per instance.
   OperationType pending_operation_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperation);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_