| Index: base/files/file_util_proxy.cc
|
| diff --git a/base/files/file_util_proxy.cc b/base/files/file_util_proxy.cc
|
| index fee97fb1c1a87ebd252d99e0ef02f3e301eb408a..207597573f0f2214a15bc0e0862b759d90085a70 100644
|
| --- a/base/files/file_util_proxy.cc
|
| +++ b/base/files/file_util_proxy.cc
|
| @@ -219,7 +219,7 @@ PlatformFileError DeleteAdapter(const FilePath& file_path, bool recursive) {
|
| if (!PathExists(file_path)) {
|
| return PLATFORM_FILE_ERROR_NOT_FOUND;
|
| }
|
| - if (!base::Delete(file_path, recursive)) {
|
| + if (!base::DeleteFile(file_path, recursive)) {
|
| if (!recursive && !file_util::IsDirectoryEmpty(file_path)) {
|
| return PLATFORM_FILE_ERROR_NOT_EMPTY;
|
| }
|
| @@ -300,26 +300,15 @@ bool FileUtilProxy::GetFileInfoFromPlatformFile(
|
|
|
| #if !defined(OS_NACL)
|
| // static
|
| -bool FileUtilProxy::Delete(TaskRunner* task_runner,
|
| - const FilePath& file_path,
|
| - bool recursive,
|
| - const StatusCallback& callback) {
|
| +bool FileUtilProxy::DeleteFile(TaskRunner* task_runner,
|
| + const FilePath& file_path,
|
| + bool recursive,
|
| + const StatusCallback& callback) {
|
| return base::PostTaskAndReplyWithResult(
|
| task_runner, FROM_HERE,
|
| Bind(&DeleteAdapter, file_path, recursive),
|
| callback);
|
| }
|
| -
|
| -// static
|
| -bool FileUtilProxy::RecursiveDelete(
|
| - TaskRunner* task_runner,
|
| - const FilePath& file_path,
|
| - const StatusCallback& callback) {
|
| - return base::PostTaskAndReplyWithResult(
|
| - task_runner, FROM_HERE,
|
| - Bind(&DeleteAdapter, file_path, true /* recursive */),
|
| - callback);
|
| -}
|
| #endif // !defined(OS_NACL)
|
|
|
| // static
|
|
|