Support for checking multiple keyfiles when removing an installation package....

chrome/installer/setup/install.cc

 // Copyright (c) 2010 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/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 
 #include "base/command_line.h"
@@ skipping 606 matching lines @@
   const Products& products = package.products();
   DCHECK(products.size());
 
   if (FindProduct(products, BrowserDistribution::CHROME_FRAME)) {
     // Make sure that we don't end up deleting installed files on next reboot.
     if (!RemoveFromMovesPendingReboot(package.path().value().c_str())) {
       LOG(ERROR) << "Error accessing pending moves value.";
     }
   }
 
-  // TODO(tommi): See if we can't get rid of this parameter.
   current_version->reset(package.GetCurrentVersion());
 
   scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
   // A temp directory that work items need and the actual install directory.
   install_list->AddCreateDirWorkItem(temp_dir);
   install_list->AddCreateDirWorkItem(package.path());
 
   // Delete any new_chrome.exe if present (we will end up creating a new one
   // if required) and then copy chrome.exe
   FilePath new_chrome_exe(
       package.path().Append(installer_util::kChromeNewExe));
 
-  install_list->AddDeleteTreeWorkItem(new_chrome_exe.value(), std::wstring());
+  install_list->AddDeleteTreeWorkItem(new_chrome_exe);
   install_list->AddCopyTreeWorkItem(
       src_path.Append(installer_util::kChromeExe).value(),
       package.path().Append(installer_util::kChromeExe).value(),
       temp_dir.value(), WorkItem::NEW_NAME_IF_IN_USE, new_chrome_exe.value());
 
   // Extra executable for 64 bit systems.
   if (Is64bit()) {
     install_list->AddCopyTreeWorkItem(
         src_path.Append(installer::kWowHelperExe).value(),
         package.path().Append(installer::kWowHelperExe).value(),
@@ skipping 15 matching lines @@
   }
 
   // Copy the default Dictionaries only if the folder doesn't exist already.
   install_list->AddCopyTreeWorkItem(
       src_path.Append(installer::kDictionaries).value(),
       package.path().Append(installer::kDictionaries).value(),
       temp_dir.value(), WorkItem::IF_NOT_PRESENT);
 
   // Delete any old_chrome.exe if present.
   install_list->AddDeleteTreeWorkItem(
-      package.path().Append(installer_util::kChromeOldExe).value(),
-      std::wstring());
+      package.path().Append(installer_util::kChromeOldExe));
 
   // Copy installer in install directory and
   // add shortcut in Control Panel->Add/Remove Programs.
   AddInstallerCopyTasks(setup_path, archive_path, temp_dir, new_version,
                         install_list.get(), package);
 
   for (size_t i = 0; i < products.size(); ++i) {
     const Product* product = products[i];
 
     AddUninstallShortcutWorkItems(setup_path, new_version, install_list.get(),
@@ skipping 155 matching lines @@
     if (!success && rollback_on_failure) {
       work_item_list->Rollback();
     }
   }
 
   return success;
 }
 
 }  // namespace installer