Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2814)

Unified Diff: chrome/installer/util/delete_tree_work_item.cc

Issue 18383003: Move DeleteAfterReboot and Move to base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/copy_tree_work_item.cc ('k') | chrome/installer/util/logging_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/delete_tree_work_item.cc
diff --git a/chrome/installer/util/delete_tree_work_item.cc b/chrome/installer/util/delete_tree_work_item.cc
index 4aaf151aefe8b2a9727986b85326273ebebc420c..a5ccf4d3240a5fa794b08a88e41771b3a4cef238 100644
--- a/chrome/installer/util/delete_tree_work_item.cc
+++ b/chrome/installer/util/delete_tree_work_item.cc
@@ -144,7 +144,7 @@ void DeleteTreeWorkItem::Rollback() {
DCHECK(!backup_path_.path().empty());
base::FilePath backup = backup_path_.path().Append(root_path_.BaseName());
if (file_util::PathExists(backup))
- file_util::Move(backup, root_path_);
+ base::Move(backup, root_path_);
}
for (ptrdiff_t i = 0; i != num_key_files_; ++i) {
@@ -154,7 +154,7 @@ void DeleteTreeWorkItem::Rollback() {
base::FilePath backup_file =
backup_dir.path().Append(key_file.BaseName());
if (file_util::PathExists(backup_file) &&
- !file_util::Move(backup_file, key_file)) {
+ !base::Move(backup_file, key_file)) {
// This could happen if we could not delete the key file to begin with.
PLOG(WARNING) << "Rollback: Failed to move backup file back in place: "
<< backup_file.value() << " to " << key_file.value();
« no previous file with comments | « chrome/installer/util/copy_tree_work_item.cc ('k') | chrome/installer/util/logging_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698