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 21 matching lines @@
 void DeleteTreeWorkItem::RollbackImpl() {
   if (moved_to_backup_) {
     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();
+  if (backup_path_.empty()) {
+    if (!backup_dir_.CreateUniqueTempDirUnderPath(temp_path_)) {
+      PLOG(ERROR) << "Failed to get backup path in folder "
+                  << temp_path_.value();
+      return base::FilePath();
+    }
+    backup_path_ = backup_dir_.GetPath();

[gab, 2016/09/28 16:31:59]

If we're going to have a local copy of this variable, then it might as well
contain the full path constructed by this method (i.e. do the Append() below
into it) and have this method return const base::FilePath& which its users will
be happy with (and will result in less copies overall, yay!)

[vabr (Chromium), 2016/09/29 09:11:03]

Done.

   }
 
-  DCHECK(!backup_path_.path().empty());
-  return backup_path_.path().Append(root_path_.BaseName());
+  DCHECK(!backup_path_.empty());
+  return backup_path_.Append(root_path_.BaseName());
 }
 
 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();
   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;
 }