Index: chrome/installer/setup/uninstall.cc |
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc |
index a7e7f6aba1dd4c44f922d1adaf5c45f83a9e9b0f..2d865350d41211b6fb4864fbef8376ef8cda0689 100644 |
--- a/chrome/installer/setup/uninstall.cc |
+++ b/chrome/installer/setup/uninstall.cc |
@@ -270,7 +270,7 @@ bool RemoveInstallerFiles(const base::FilePath& installer_directory, |
continue; |
VLOG(1) << "Deleting installer path " << to_delete.value(); |
- if (!base::Delete(to_delete, true)) { |
+ if (!base::DeleteFile(to_delete, true)) { |
LOG(ERROR) << "Failed to delete path: " << to_delete.value(); |
success = false; |
} |
@@ -402,7 +402,7 @@ DeleteResult DeleteEmptyDir(const base::FilePath& path) { |
if (!file_util::IsDirectoryEmpty(path)) |
return DELETE_NOT_EMPTY; |
- if (base::Delete(path, true)) |
+ if (base::DeleteFile(path, true)) |
return DELETE_SUCCEEDED; |
LOG(ERROR) << "Failed to delete folder: " << path.value(); |
@@ -449,7 +449,7 @@ DeleteResult DeleteLocalState( |
for (size_t i = 0; i < local_state_folders.size(); ++i) { |
const base::FilePath& user_local_state = local_state_folders[i]; |
VLOG(1) << "Deleting user profile " << user_local_state.value(); |
- if (!base::Delete(user_local_state, true)) { |
+ if (!base::DeleteFile(user_local_state, true)) { |
LOG(ERROR) << "Failed to delete user profile dir: " |
<< user_local_state.value(); |
if (schedule_on_failure) { |
@@ -500,7 +500,7 @@ bool MoveSetupOutOfInstallFolder(const InstallerState& installer_state, |
// We cannot delete the file right away, but try to delete it some other |
// way. Either with the help of a different process or the system. |
- if (ret && !base::DeleteAfterReboot(temp_file)) { |
+ if (ret && !base::DeleteFileAfterReboot(temp_file)) { |
static const uint32 kDeleteAfterMs = 10 * 1000; |
installer::DeleteFileFromTempProcess(temp_file, kDeleteAfterMs); |
} |
@@ -543,7 +543,7 @@ DeleteResult DeleteAppHostFilesAndFolders(const InstallerState& installer_state, |
DeleteResult result = DELETE_SUCCEEDED; |
base::FilePath app_host_exe(target_path.Append(installer::kChromeAppHostExe)); |
- if (!base::Delete(app_host_exe, false)) { |
+ if (!base::DeleteFile(app_host_exe, false)) { |
result = DELETE_FAILED; |
LOG(ERROR) << "Failed to delete path: " << app_host_exe.value(); |
} |
@@ -589,7 +589,7 @@ DeleteResult DeleteChromeFilesAndFolders(const InstallerState& installer_state, |
} |
VLOG(1) << "Deleting install path " << to_delete.value(); |
- if (!base::Delete(to_delete, true)) { |
+ if (!base::DeleteFile(to_delete, true)) { |
LOG(ERROR) << "Failed to delete path (1st try): " << to_delete.value(); |
if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) { |
// We don't try killing Chrome processes for Chrome Frame builds since |
@@ -605,7 +605,7 @@ DeleteResult DeleteChromeFilesAndFolders(const InstallerState& installer_state, |
// Try closing any running Chrome processes and deleting files once |
// again. |
CloseAllChromeProcesses(); |
- if (!base::Delete(to_delete, true)) { |
+ if (!base::DeleteFile(to_delete, true)) { |
LOG(ERROR) << "Failed to delete path (2nd try): " |
<< to_delete.value(); |
result = DELETE_FAILED; |
@@ -1351,7 +1351,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state, |
// Try and delete the preserved local state once the post-install |
// operations are complete. |
if (!backup_state_file.empty()) |
- base::Delete(backup_state_file, false); |
+ base::DeleteFile(backup_state_file, false); |
return ret; |
} |