installer and some misc files: Change ScopedTempDir::path() to GetPath()

chrome/installer/util/delete_tree_work_item.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/delete_tree_work_item.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 
 DeleteTreeWorkItem::DeleteTreeWorkItem(const base::FilePath& root_path,
@@ skipping 13 matching lines @@
   // in the worst case the file(s) will be removed after the next reboot.
   if (!rollback_enabled() && DeleteRoot())
     return true;
 
   // Attempt to move the root to the backup.
   return MoveRootToBackup();
 }
 
 void DeleteTreeWorkItem::RollbackImpl() {
   if (moved_to_backup_) {
-    base::FilePath backup = GetBackupPath();
+    const base::FilePath& backup = GetBackupPath();
     DCHECK(!backup.empty());
     if (base::PathExists(backup))
       base::Move(backup, root_path_);
   }
 }
 
-base::FilePath DeleteTreeWorkItem::GetBackupPath() {
-  if (backup_path_.path().empty() &&
-      !backup_path_.CreateUniqueTempDirUnderPath(temp_path_)) {
-    PLOG(ERROR) << "Failed to get backup path in folder " << temp_path_.value();
-    return base::FilePath();
+const base::FilePath& DeleteTreeWorkItem::GetBackupPath() {
+  if (backup_path_.empty()) {
+    if (!backup_dir_.CreateUniqueTempDirUnderPath(temp_path_)) {
+      PLOG(ERROR) << "Failed to get backup path in folder "
+                  << temp_path_.value();
+      return backup_path_;
+    }
+    backup_path_ = backup_dir_.GetPath().Append(root_path_.BaseName());
   }
 
-  DCHECK(!backup_path_.path().empty());
-  return backup_path_.path().Append(root_path_.BaseName());
+  DCHECK(!backup_path_.empty());
+  return backup_path_;
 }
 
 bool DeleteTreeWorkItem::DeleteRoot() {
   if (base::DeleteFile(root_path_, true))
     return true;
   LOG(ERROR) << "Failed to delete " << root_path_.value();
   return false;
 }
 
 bool DeleteTreeWorkItem::MoveRootToBackup() {
-  base::FilePath backup = GetBackupPath();
+  const base::FilePath& backup = GetBackupPath();
   if (backup.empty())
     return false;
   if (base::Move(root_path_, backup)) {
     moved_to_backup_ = true;
     return true;
   }
   PLOG(ERROR) << "Failed to move " << root_path_.value()
               << " to backup path " << backup.value();
   return false;
 }