Only do DelegateExecute verb handler registration for Google Chrome.

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2012 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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <vector>
 
@@ skipping 671 matching lines @@
     InstallUtil::DeleteRegistryKey(roots[i], ext_prog_id);
 
     // Delete Software\Classes\.crx,
     std::wstring ext_association(ShellUtil::kRegClasses);
     ext_association.append(L"\\");
     ext_association.append(chrome::kExtensionFileExtension);
     InstallUtil::DeleteRegistryKey(roots[i], ext_association);
   }
 }
 
-bool ProcessChromeWorkItems(const InstallationState& original_state,
-                            const InstallerState& installer_state,
-                            const FilePath& setup_path,
-                            const Product& product) {
-  if (product.is_chrome())
-    return false;
-
-  scoped_ptr<WorkItemList> item_list(WorkItem::CreateWorkItemList());
-  AddChromeWorkItems(original_state, installer_state, setup_path, Version(),
-                     product, item_list.get());
+bool ProcessDelegateExecuteWorkItems(const InstallationState& original_state,
+                                     const InstallerState& installer_state,
+                                     const FilePath& setup_path,
+                                     const Product& product) {
+  scoped_ptr<WorkItemList> item_list(WorkItem::CreateNoRollbackWorkItemList());
+  AddDelegateExecuteWorkItems(original_state, installer_state, setup_path,
+                              Version(), product, item_list.get());
   return item_list->Do();
 }
 
 bool ProcessChromeFrameWorkItems(const InstallationState& original_state,
                                  const InstallerState& installer_state,
                                  const FilePath& setup_path,
                                  const Product& product) {
   if (!product.is_chrome_frame())
     return false;
 
-  scoped_ptr<WorkItemList> item_list(WorkItem::CreateWorkItemList());
+  scoped_ptr<WorkItemList> item_list(WorkItem::CreateNoRollbackWorkItemList());
   AddChromeFrameWorkItems(original_state, installer_state, setup_path,
                           Version(), product, item_list.get());
   return item_list->Do();
 }
 
 InstallStatus UninstallProduct(const InstallationState& original_state,
                                const InstallerState& installer_state,
                                const FilePath& setup_path,
                                const Product& product,
                                bool remove_all,
@@ skipping 89 matching lines @@
                                suffix, installer_state.target_path(), &ret);
 
   // Registration data is put in HKLM for system level and possibly user level
   // installs (when Chrome is made the default browser at install-time).
   if (installer_state.system_install() || remove_all &&
       (!suffix.empty() || CurrentUserHasDefaultBrowser(installer_state))) {
     DeleteChromeRegistrationKeys(product.distribution(), HKEY_LOCAL_MACHINE,
                                  suffix, installer_state.target_path(), &ret);
   }
 
-  if (is_chrome) {
-    ProcessChromeWorkItems(original_state, installer_state, setup_path,
-                           product);
-  } else {
+  ProcessDelegateExecuteWorkItems(original_state, installer_state, setup_path,

[robertshield, 2012/04/17 14:51:19]

perhaps a clarifying comment here on near the implementation mentioning that
this is a no-op for products that don't have delegate execute work items

[grt (UTC plus 2), 2012/04/17 15:27:33]

Done.

+                                  product);
+
+  if (!is_chrome) {
     ProcessChromeFrameWorkItems(original_state, installer_state, setup_path,
                                 product);
   }
 
   if (installer_state.is_multi_install())
     ProcessGoogleUpdateItems(original_state, installer_state, product);
 
   ProcessQuickEnableWorkItems(installer_state, original_state);
 
   // Get the state of the installed product (if any)
@@ skipping 108 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer