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

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

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
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 812c1d05fbea41e7c349c07b2b72774bae25bdfb..31e06bd48ae16d78b44406a59c46c8a781277b47 100644
--- a/chrome/installer/util/delete_tree_work_item.cc
+++ b/chrome/installer/util/delete_tree_work_item.cc
@@ -38,7 +38,7 @@ DeleteTreeWorkItem::DeleteTreeWorkItem(
NOTREACHED() << "Impossibly large key_paths collection";
} else if (num_key_files_ != 0) {
key_paths_.reset(new FilePath[num_key_files_]);
- key_backup_paths_.reset(new ScopedTempDir[num_key_files_]);
+ key_backup_paths_.reset(new base::ScopedTempDir[num_key_files_]);
std::copy(key_paths.begin(), key_paths.end(), &key_paths_[0]);
}
}
@@ -57,7 +57,7 @@ bool DeleteTreeWorkItem::Do() {
bool abort = false;
for (ptrdiff_t i = 0; !abort && i != num_key_files_; ++i) {
FilePath& key_file = key_paths_[i];
- ScopedTempDir& backup = key_backup_paths_[i];
+ base::ScopedTempDir& backup = key_backup_paths_[i];
if (!ignore_failure_) {
if (!backup.CreateUniqueTempDirUnderPath(temp_path_)) {
PLOG(ERROR) << "Could not create temp dir in " << temp_path_.value();
@@ -147,7 +147,7 @@ void DeleteTreeWorkItem::Rollback() {
}
for (ptrdiff_t i = 0; i != num_key_files_; ++i) {
- ScopedTempDir& backup_dir = key_backup_paths_[i];
+ base::ScopedTempDir& backup_dir = key_backup_paths_[i];
if (!backup_dir.path().empty()) {
FilePath& key_file = key_paths_[i];
FilePath backup_file = backup_dir.path().Append(key_file.BaseName());
« no previous file with comments | « chrome/installer/util/delete_tree_work_item.h ('k') | chrome/installer/util/delete_tree_work_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698