| Index: chrome/installer/util/move_tree_work_item.cc
|
| diff --git a/chrome/installer/util/move_tree_work_item.cc b/chrome/installer/util/move_tree_work_item.cc
|
| index 7190222368fb66206be737d0bfd1c1d3ab032735..ccbbf64a86954798249a25e2452e6a4cd0d09229 100644
|
| --- a/chrome/installer/util/move_tree_work_item.cc
|
| +++ b/chrome/installer/util/move_tree_work_item.cc
|
| @@ -55,7 +55,7 @@ bool MoveTreeWorkItem::Do() {
|
| // The files we are moving are already present in the destination path.
|
| // We most likely don't need to do anything. As such, just move the
|
| // source files to the temp folder as backup.
|
| - if (file_util::Move(source_path_, backup)) {
|
| + if (base::Move(source_path_, backup)) {
|
| source_moved_to_backup_ = true;
|
| VLOG(1) << "Moved source " << source_path_.value()
|
| << " to backup path " << backup.value();
|
| @@ -74,7 +74,7 @@ bool MoveTreeWorkItem::Do() {
|
| }
|
| }
|
|
|
| - if (file_util::Move(dest_path_, backup)) {
|
| + if (base::Move(dest_path_, backup)) {
|
| moved_to_backup_ = true;
|
| VLOG(1) << "Moved destination " << dest_path_.value()
|
| << " to backup path " << backup.value();
|
| @@ -86,7 +86,7 @@ bool MoveTreeWorkItem::Do() {
|
| }
|
|
|
| // Now move source to destination.
|
| - if (file_util::Move(source_path_, dest_path_)) {
|
| + if (base::Move(source_path_, dest_path_)) {
|
| moved_to_dest_path_ = true;
|
| VLOG(1) << "Moved source " << source_path_.value()
|
| << " to destination " << dest_path_.value();
|
| @@ -100,17 +100,17 @@ bool MoveTreeWorkItem::Do() {
|
| }
|
|
|
| void MoveTreeWorkItem::Rollback() {
|
| - if (moved_to_dest_path_ && !file_util::Move(dest_path_, source_path_))
|
| + if (moved_to_dest_path_ && !base::Move(dest_path_, source_path_))
|
| LOG(ERROR) << "Can not move " << dest_path_.value()
|
| << " to " << source_path_.value();
|
|
|
| base::FilePath backup = backup_path_.path().Append(dest_path_.BaseName());
|
| - if (moved_to_backup_ && !file_util::Move(backup, dest_path_)) {
|
| + if (moved_to_backup_ && !base::Move(backup, dest_path_)) {
|
| LOG(ERROR) << "failed move " << backup.value()
|
| << " to " << dest_path_.value();
|
| }
|
|
|
| - if (source_moved_to_backup_ && !file_util::Move(backup, source_path_)) {
|
| + if (source_moved_to_backup_ && !base::Move(backup, source_path_)) {
|
| LOG(ERROR) << "Can not restore " << backup.value()
|
| << " to " << source_path_.value();
|
| }
|
|
|