Rename base::Delete to base::DeleteFile
Also renames DeleteAfterReboot to DeleteFileAfterReboot, and removes FileUtilProxy::RecursiveDelete which was never called.
BUG=
R=shess@chromium.org
Review URL: https://codereview.chromium.org/18584011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211822 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: dd3aa79b68b6752e89a6be0af51506674925337a
diff --git a/base/files/file_util_proxy.cc b/base/files/file_util_proxy.cc
index fee97fb..2075975 100644
--- a/base/files/file_util_proxy.cc
+++ b/base/files/file_util_proxy.cc
@@ -219,7 +219,7 @@
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 @@
#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