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

chrome/installer/setup/setup_main.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 <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 108 matching lines @@
 // new_chrome.exe to chrome.exe and delete 'opv' key in one atomic operation.
 installer_util::InstallStatus RenameChromeExecutables(
     const Package& installation) {
   FilePath chrome_exe(installation.path().Append(installer_util::kChromeExe));
   FilePath chrome_old_exe(installation.path().Append(
       installer_util::kChromeOldExe));
   FilePath chrome_new_exe(installation.path().Append(
       installer_util::kChromeNewExe));
 
   scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
-  install_list->AddDeleteTreeWorkItem(chrome_old_exe.value(), std::wstring());
+  install_list->AddDeleteTreeWorkItem(chrome_old_exe);
   FilePath temp_path;
   if (!file_util::CreateNewTempDirectory(L"chrome_", &temp_path)) {
     LOG(ERROR) << "Failed to create Temp directory " << temp_path.value();
     return installer_util::RENAME_FAILED;
   }
 
   install_list->AddCopyTreeWorkItem(chrome_new_exe.value(),
                                     chrome_exe.value(),
                                     temp_path.ToWStringHack(),
                                     WorkItem::IF_DIFFERENT,
                                     std::wstring());
-  install_list->AddDeleteTreeWorkItem(chrome_new_exe.value(), std::wstring());
+  install_list->AddDeleteTreeWorkItem(chrome_new_exe);
 
   HKEY reg_root = installation.system_level() ? HKEY_LOCAL_MACHINE :
                                                 HKEY_CURRENT_USER;
   const Products& products = installation.products();
   for (size_t i = 0; i < products.size(); ++i) {
     const Product* product = products[i];
     BrowserDistribution* browser_dist = product->distribution();
     std::wstring version_key(browser_dist->GetVersionKey());
     install_list->AddDeleteRegValueWorkItem(reg_root,
                                             version_key,
@@ skipping 687 matching lines @@
       // to pass through, since this is only returned on uninstall which is
       // never invoked directly by Google Update.
       return_code = BrowserDistribution::GetInstallReturnCode(install_status);
     }
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }