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

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

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/move_tree_work_item.h ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/move_tree_work_item.cc
===================================================================
--- chrome/installer/util/move_tree_work_item.cc (revision 29088)
+++ chrome/installer/util/move_tree_work_item.cc (working copy)
@@ -26,30 +26,26 @@
bool MoveTreeWorkItem::Do() {
if (!file_util::PathExists(source_path_)) {
- LOG(ERROR) << source_path_ << " does not exist";
+ LOG(ERROR) << source_path_.value() << " does not exist";
return false;
}
- FilePath backup_path;
-
// If dest_path_ exists, move destination to a backup path.
if (file_util::PathExists(dest_path_)) {
// Generate a backup path that can keep the original files under dest_path_.
if (!file_util::CreateTemporaryFileInDir(FilePath(temp_dir_),
- &backup_path)) {
- LOG(ERROR) << "Failed to get backup path in folder " << temp_dir_;
+ &backup_path_)) {
+ LOG(ERROR) << "Failed to get backup path in folder " << temp_dir_.value();
return false;
}
- backup_path_ = backup_path.value();
-
if (file_util::Move(dest_path_, backup_path_)) {
moved_to_backup_ = true;
- LOG(INFO) << "Moved destination " << dest_path_
- << " to backup path " << backup_path_;
+ LOG(INFO) << "Moved destination " << dest_path_.value()
+ << " to backup path " << backup_path_.value();
} else {
- LOG(ERROR) << "failed moving " << dest_path_
- << " to " << backup_path_;
+ LOG(ERROR) << "failed moving " << dest_path_.value()
+ << " to " << backup_path_.value();
return false;
}
}
@@ -57,10 +53,11 @@
// Now move source to destination.
if (file_util::Move(source_path_, dest_path_)) {
moved_to_dest_path_ = true;
- LOG(INFO) << "Moved source " << source_path_
- << " to destination " << dest_path_;
+ LOG(INFO) << "Moved source " << source_path_.value()
+ << " to destination " << dest_path_.value();
} else {
- LOG(ERROR) << "failed move " << source_path_ << " to " << dest_path_;
+ LOG(ERROR) << "failed move " << source_path_.value() << " to " <<
+ dest_path_.value();
return false;
}
@@ -69,8 +66,10 @@
void MoveTreeWorkItem::Rollback() {
if (moved_to_dest_path_ && !file_util::Move(dest_path_, source_path_))
- LOG(ERROR) << "Can not move " << dest_path_ << " to " << source_path_;
+ LOG(ERROR) << "Can not move " << dest_path_.value() <<
+ " to " << source_path_.value();
if (moved_to_backup_ && !file_util::Move(backup_path_, dest_path_))
- LOG(ERROR) << "failed move " << backup_path_ << " to " << dest_path_;
+ LOG(ERROR) << "failed move " << backup_path_.value() <<
+ " to " << dest_path_.value();
}
« no previous file with comments | « chrome/installer/util/move_tree_work_item.h ('k') | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698