Installer: adding ResolveShortcutProperties(); updating shortcut icons during shortcut migration.

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 cb5409b7b8835e82fdadb18109fa2fcb351acd8d..ddb4c4b1f0fb847441c6839ce0ee4525206acecb 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -326,17 +326,15 @@ void RetargetUserShortcutsWithArgs(const InstallerState& installer_state,
   }
   BrowserDistribution* dist = product.distribution();
   ShellUtil::ShellChange install_level = ShellUtil::CURRENT_USER;
-  ShellUtil::ShortcutProperties updated_properties(install_level);
-  updated_properties.set_target(new_target_exe);
 
   // Retarget all shortcuts that point to |old_target_exe| from all
   // ShellUtil::ShortcutLocations.
   VLOG(1) << "Retargeting shortcuts.";
   for (int location = ShellUtil::SHORTCUT_LOCATION_FIRST;
       location < ShellUtil::NUM_SHORTCUT_LOCATIONS; ++location) {
-    if (!ShellUtil::UpdateShortcutsWithArgs(
+    if (!ShellUtil::RetargetShortcutsWithArgs(
             static_cast<ShellUtil::ShortcutLocation>(location), dist,
-            install_level, old_target_exe, updated_properties)) {
+            install_level, old_target_exe, new_target_exe)) {
       LOG(WARNING) << "Failed to retarget shortcuts in ShortcutLocation: "
                    << location;
     }