Fix in-use updates for Chrome Frame.

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2011 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 "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 101 matching lines @@
     const installer::InstallationState& machine_state) {
   scoped_ptr<WorkItemList> work_item_list(
       WorkItem::CreateNoRollbackWorkItemList());
 
   AddQuickEnableWorkItems(installer_state, machine_state, NULL, NULL,
                           work_item_list.get());
   if (!work_item_list->Do())
     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,
                                          rlz_lib::NO_ACCESS_POINT};
 
   rlz_lib::ClearProductState(rlz_lib::CHROME, points);
 
   // If chrome has been reactivated, clear all events for this brand as well.
   std::wstring reactivation_brand;
   if (GoogleUpdateSettings::GetReactivationBrand(&reactivation_brand)) {
@@ skipping 651 matching lines @@
           WorkItem::CreateWorkItemList());
 
       AddRegisterComDllWorkItems(dll_folder,
                                  com_dll_list,
                                  installer_state.system_install(),
                                  false,  // Unregister
                                  true,   // May fail
                                  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.
   if (product.is_chrome_frame()) {
     VLOG(1) << "Closing the Chrome Frame helper process";
     CloseChromeFrameHelperProcess();
   }
 
   if (product_state == NULL)
     return installer::UNINSTALL_SUCCESSFUL;
@@ skipping 15 matching lines @@
       if (prod_state.Initialize(installer_state.system_install(),
                                 BrowserDistribution::kProductTypes[i]) &&
           prod_state.is_multi_install()) {
         can_delete_files = false;
         break;
       }
     }
     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());
     }
   }
 
   FilePath backup_state_file(BackupLocalStateFile(
       GetLocalStateFolder(product)));
 
   DeleteResult delete_result = DELETE_SUCCEEDED;
@@ skipping 24 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