Only do DelegateExecute verb handler registration for Google Chrome.

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 599c5809dd8399ae1ac7244a33d90d82ea2b99c2..1f273eff4608aa74a42eaf727ff083fd8e27c0d5 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -689,16 +689,13 @@ const wchar_t kChromeExtProgId[] = L"ChromiumExt";
   }
 }
 
-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();
 }
 
@@ -709,7 +706,7 @@ bool ProcessChromeFrameWorkItems(const InstallationState& original_state,
   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();
@@ -819,10 +816,10 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
                                  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);
   }