summaryrefslogtreecommitdiffstats
path: root/webkit/browser/fileapi/obfuscated_file_util.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 19:10:23 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 19:10:23 +0000
commitdd3aa79b68b6752e89a6be0af51506674925337a (patch)
treef70f4d0f405009fea8b53ad907d62184b45eaba0 /webkit/browser/fileapi/obfuscated_file_util.cc
parent13816d3fcfe2e4e109752cf03fe15ebbaf23e85e (diff)
downloadchromium_src-dd3aa79b68b6752e89a6be0af51506674925337a.zip
chromium_src-dd3aa79b68b6752e89a6be0af51506674925337a.tar.gz
chromium_src-dd3aa79b68b6752e89a6be0af51506674925337a.tar.bz2
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
Diffstat (limited to 'webkit/browser/fileapi/obfuscated_file_util.cc')
-rw-r--r--webkit/browser/fileapi/obfuscated_file_util.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index c4baa68..e0b5012 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -901,7 +901,7 @@ bool ObfuscatedFileUtil::DeleteDirectoryForOriginAndType(
// implementation.
// Information about failure would be useful for debugging.
DestroyDirectoryDatabase(origin, type);
- if (!base::Delete(origin_type_path, true /* recursive */))
+ if (!base::DeleteFile(origin_type_path, true /* recursive */))
return false;
}
@@ -935,7 +935,7 @@ bool ObfuscatedFileUtil::DeleteDirectoryForOriginAndType(
origin_database_->RemovePathForOrigin(
webkit_database::GetIdentifierFromOrigin(origin));
}
- if (!base::Delete(origin_path, true /* recursive */))
+ if (!base::DeleteFile(origin_path, true /* recursive */))
return false;
return true;
@@ -1104,7 +1104,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
created = true;
} else {
if (base::PathExists(dest_local_path)) {
- if (!base::Delete(dest_local_path, true /* recursive */)) {
+ if (!base::DeleteFile(dest_local_path, true /* recursive */)) {
NOTREACHED();
return base::PLATFORM_FILE_ERROR_FAILED;
}
@@ -1129,7 +1129,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
if (handle) {
DCHECK_NE(base::kInvalidPlatformFileValue, *handle);
base::ClosePlatformFile(*handle);
- base::Delete(dest_local_path, false /* recursive */);
+ base::DeleteFile(dest_local_path, false /* recursive */);
}
return base::PLATFORM_FILE_ERROR_FAILED;
}
@@ -1145,7 +1145,7 @@ PlatformFileError ObfuscatedFileUtil::CreateFile(
DCHECK_NE(base::kInvalidPlatformFileValue, *handle);
base::ClosePlatformFile(*handle);
}
- base::Delete(dest_local_path, false /* recursive */);
+ base::DeleteFile(dest_local_path, false /* recursive */);
return base::PLATFORM_FILE_ERROR_FAILED;
}
TouchDirectory(db, dest_file_info->parent_id);
@@ -1240,7 +1240,7 @@ base::FilePath ObfuscatedFileUtil::GetDirectoryForOrigin(
base::FilePath path = file_system_directory_.Append(directory_name);
bool exists_in_fs = base::DirectoryExists(path);
if (!exists_in_db && exists_in_fs) {
- if (!base::Delete(path, true)) {
+ if (!base::DeleteFile(path, true)) {
if (error_code)
*error_code = base::PLATFORM_FILE_ERROR_FAILED;
return base::FilePath();