Fix in-use updates for Chrome Frame.

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 f0d7a588ff55f48b2d44abd4b56ada5b6d9ad2ed..823b86b8a021bda8629cf6ddc43464e3a66e4b33 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -119,6 +119,15 @@ void ProcessQuickEnableWorkItems(
     LOG(ERROR) << "Failed to update quick-enable-cf command.";
 }
 
+void ProcessIELowRightsPolicyWorkItems(
+    const installer::InstallerState& installer_state) {
+  scoped_ptr<WorkItemList> work_items(WorkItem::CreateNoRollbackWorkItemList());
+  MaybeAddDeleteOldIELowRightsPolicyWorkItems(installer_state,
+                                              work_items.get());
+  work_items->Do();
+  installer::RefreshElevationPolicy();
+}
+
 void ClearRlzProductState() {
   const rlz_lib::AccessPoint points[] = {rlz_lib::CHROME_OMNIBOX,
                                          rlz_lib::CHROME_HOME_PAGE,
@@ -790,6 +799,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
                                  unreg_work_item_list.get());
       unreg_work_item_list->Do();
     }
+
+    ProcessIELowRightsPolicyWorkItems(installer_state);

[robertshield, 2011/09/22 20:34:10]

Feels like it would be okay to wrap this in an is_chrome_frame check as per
other checks above (related to comment about removing the "Maybe" from the EP
methods.

[grt (UTC plus 2), 2011/09/23 18:21:07]

Done.

   }
 
   // Close any Chrome Frame helper processes that may be running.
@@ -825,14 +836,6 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     LOG(INFO) << (can_delete_files ? "Shared binaries will be deleted." :
                                      "Shared binaries still in use.");
     if (can_delete_files) {
-      // Remove the elevation policy when the last product is uninstalled.
-      scoped_ptr<WorkItemList> work_items(
-          WorkItem::CreateNoRollbackWorkItemList());
-      AddElevationPolicyWorkItems(original_state, installer_state,
-          product_state->version(), work_items.get());
-      work_items->Do();
-      RefreshElevationPolicy();
-
       BrowserDistribution* multi_dist =
           installer_state.multi_package_binaries_distribution();
       InstallUtil::DeleteRegistryKey(reg_root, multi_dist->GetVersionKey());