Delete chrome.7z archives in the current installation when doing an upgrade t...

chrome/installer/util/delete_tree_work_item.cc

 // Copyright (c) 2009 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 <algorithm>
 #include <limits>
 
 #include "base/file_util.h"
@@ skipping 86 matching lines @@
   std::for_each(opened_key_files.begin(), opened_key_files.end(), CloseHandle);
   opened_key_files.clear();
 
   if (abort) {
     LOG(ERROR) << "Could not exclusively hold all key files.";
     return ignore_failure_;
   }
 
   // Now that we've taken care of the key files, take care of the rest.
   if (!root_path_.empty() && file_util::PathExists(root_path_)) {
-    if (!backup_path_.CreateUniqueTempDirUnderPath(temp_path_)) {
-      PLOG(ERROR) << "Failed to get backup path in folder "
-                  << temp_path_.value();
+    if (!ignore_failure_) {
+      if (!backup_path_.CreateUniqueTempDirUnderPath(temp_path_)) {
+        PLOG(ERROR) << "Failed to get backup path in folder "
+                    << temp_path_.value();
+        return false;
+      } else {
+        FilePath backup = backup_path_.path().Append(root_path_.BaseName());
+        if (!file_util::CopyDirectory(root_path_, backup, true)) {
+          LOG(ERROR) << "can not copy " << root_path_.value()
+                     << " to backup path " << backup.value();
+          return false;
+        }
+      }
+    }
+    if (!file_util::Delete(root_path_, true)) {
+      LOG(ERROR) << "can not delete " << root_path_.value();
       return ignore_failure_;
-    } else {
-      FilePath backup = backup_path_.path().Append(root_path_.BaseName());
-      if (!file_util::CopyDirectory(root_path_, backup, true) ||
-          !file_util::Delete(root_path_, true)) {
-        LOG(ERROR) << "can not delete " << root_path_.value()
-                   << " OR copy it to backup path " << backup.value();
-        return ignore_failure_;
-      }
     }
   }
 
   return true;
 }
 
 // If there are files in backup paths move them back.
 void DeleteTreeWorkItem::Rollback() {
   if (ignore_failure_)
     return;
@@ skipping 11 matching lines @@
       FilePath backup_file = backup_dir.path().Append(key_file.BaseName());
       if (file_util::PathExists(backup_file) &&
           !file_util::Move(backup_file, key_file)) {
         // This could happen if we could not delete the key file to begin with.
         PLOG(WARNING) << "Rollback: Failed to move backup file back in place: "
                       << backup_file.value() << " to " << key_file.value();
       }
     }
   }
 }