Fix the path of shortcuts with an icon in the current install dir.

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 744af926972ec5fa5d07687713591f568cb17cd1..c7b5d94ab7e07f2536538251b6be0f8262ca5fc6 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -261,7 +261,7 @@ void UpdatePerUserShortcutsInLocation(
     const ShellUtil::ShortcutLocation shortcut_location,
     BrowserDistribution* dist,
     const base::FilePath& old_target_dir,
-    const base::FilePath& old_target_path_suffix,
+    const base::FilePath& old_target_name_suffix,
     const base::FilePath& new_target_path) {
   base::FilePath shortcut_path;
   const bool get_shortcut_path_return = ShellUtil::GetShortcutPath(
@@ -282,14 +282,24 @@ void UpdatePerUserShortcutsInLocation(
                                       base::FileEnumerator::FILES);
   for (base::FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty();
        shortcut = shortcuts_enum.Next()) {
-    base::FilePath existing_target_path;
-    if (!base::win::ResolveShortcut(shortcut, &existing_target_path, nullptr) ||
-        !base::StartsWith(existing_target_path.value(),
-                          old_target_dir.AsEndingWithSeparator().value(),
-                          base::CompareCase::INSENSITIVE_ASCII) ||
-        !base::EndsWith(existing_target_path.value(),
-                        old_target_path_suffix.value(),
-                        base::CompareCase::INSENSITIVE_ASCII)) {
+    base::win::ShortcutProperties shortcut_properties;
+    if (!base::win::ResolveShortcutProperties(
+            shortcut, (base::win::ShortcutProperties::PROPERTIES_TARGET |
+                       base::win::ShortcutProperties::PROPERTIES_ICON),
+            &shortcut_properties)) {
+      continue;
+    }
+
+    // Skip shortcuts whose target isn't a file rooted at |old_target_dir| with
+    // a name ending in |old_target_name_suffix|. Except for shortcuts whose
+    // icon is rooted at |old_target_dir|.
+    // TODO(fdoray): The second condition is only intended to fix Canary
+    // shortcuts broken by crbug.com/595374, remove it in May 2016.
+    if (!(old_target_dir.IsParent(shortcut_properties.target) &&
+          base::EndsWith(shortcut_properties.target.BaseName().value(),
+                         old_target_name_suffix.value(),
+                         base::CompareCase::INSENSITIVE_ASCII)) &&
+        !old_target_dir.IsParent(shortcut_properties.icon)) {
       continue;
     }