Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8

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 3e34d577caa9ae0256c0975b37ca880ee10406ea..a501a8f4a4aa9ab5973f24f7d2c48450d2facd50 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -127,6 +127,17 @@ void ProcessGoogleUpdateItems(
   }
 }
 
+void ProcessOnOsUpgradeWorkItems(
+    const installer::InstallerState& installer_state,
+    const installer::Product& product) {
+  scoped_ptr<WorkItemList> work_item_list(
+      WorkItem::CreateNoRollbackWorkItemList());
+  AddOsUpgradeWorkItems(installer_state, NULL, NULL, product,
+                        work_item_list.get());
+  if (!work_item_list->Do())
+    LOG(ERROR) << "Failed to remove on-os-upgrade command.";
+}
+
 // Adds or removes the quick-enable-cf command to the binaries' version key in
 // the registry as needed.
 void ProcessQuickEnableWorkItems(
@@ -1066,6 +1077,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
 
     ProcessDelegateExecuteWorkItems(installer_state, product);
 
+    ProcessOnOsUpgradeWorkItems(installer_state, product);
+
 // TODO(gab): This is only disabled for M22 as the shortcut CL using Active
 // Setup will not make it in M22.
 #if 0