Fix the path of Chrome shortcuts from the installer.

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 a8660d36716ed36d2fa285ad49c7865422742f9e..2abff153abddea0809f37f00da7f17f35708fb20 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -27,6 +27,7 @@
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/setup/update_active_setup_version_work_item.h"
+#include "chrome/installer/setup/update_shortcuts.h"
 #include "chrome/installer/util/beacons.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/create_reg_key_work_item.h"
@@ -37,6 +38,7 @@
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
+#include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
@@ -418,6 +420,34 @@ void CreateOrUpdateShortcuts(
   ExecuteAndLogShortcutOperation(
       ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
       start_menu_properties, shortcut_operation);
+
+  // Update the target path of existing shortcuts.

[gab, 2016/03/09 20:10:44]

s/shortcuts/per-user shortcuts/

[fdoray, 2016/03/09 22:13:03]

Done.

+  if (install_operation == INSTALL_SHORTCUT_REPLACE_EXISTING) {
+    const base::FilePath target_path_prefix = target.DirName();

[gab, 2016/03/09 20:10:44]

If I'm not mistaken, |target_path| here will be something like
C:\Users\<user>\AppData\Local\Google\Chrome SxS\Application\chrome.exe
so I think for the prefix you want .DirName().DirName() to be one-level below
Application/

[gab, 2016/03/09 20:10:44]

How about:

s/target_path_prefix/updated_prefix/
s/target_path_suffix/updated_suffix/

?

[fdoray, 2016/03/09 22:13:03]

Done.

[fdoray, 2016/03/09 22:13:03]

Done. I didn't use the path from the bug report to test this code initially... I
did test the updated CL with the path from the bug report.

+    const base::FilePath target_path_suffix = target.BaseName();
+
+    UpdateShortcuts(ShellUtil::SHORTCUT_LOCATION_DESKTOP, shortcut_level, dist,

[gab, 2016/03/09 20:10:44]

s/shortcut_level/ShellUtil::CURRENT_USER/

here and below (but don't add "&& shortcut_level == ShellUtil::CURRENT_USER" to
initial condition as fixing up per-user shortcuts on system-level installs has
the advantage to also work for any user running the installer as admin for
himself (instead of say an update running as SYSTEM which isn't a "user" in the
shortcut world).

[fdoray, 2016/03/09 22:13:02]

CURRENT_USER now hard-coded in UpdatePerUserShortcutsInLocation

+                    target_path_prefix, target_path_suffix, target);
+    UpdateShortcuts(ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT,

[gab, 2016/03/09 20:10:43]

Don't think we need to touch the Start Menu shortcut -- it's always at install
level and thus already updated above. Plus recursing through all shortcuts in
Start Menu seems overkill (I guess it could fixup some Chrome Apps shortcut, but
if that's a goal we should explicit list the Apps Shortcut folder here instead
of SHORTCUT_LOCATION_START_MENU_ROOT).

[fdoray, 2016/03/09 22:13:03]

Done.

+                    shortcut_level, dist, target_path_prefix,
+                    target_path_suffix, target);
+
+    // Check that the quick launch directory is a parent of the taskbar pins

[gab, 2016/03/09 20:10:44]

// The next update assumes that the quick launch directory is a parent of the
taskbar pins directory, confirm that this is true.

[fdoray, 2016/03/09 22:13:03]

I now have separate calls to UpdatePerUserShortcutsInLocation to update quick
launch and taskbar pins.

+    // directory.
+    if (DCHECK_IS_ON()) {
+      base::FilePath taskbar_pins_path;
+      ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS,
+                                 dist, shortcut_level, &taskbar_pins_path);
+      base::FilePath quick_launch_path;
+      ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
+                                 dist, shortcut_level, &quick_launch_path);
+      DCHECK(quick_launch_path.IsParent(taskbar_pins_path));
+    }
+    // This updates both quick launch and taskbar pins.

[gab, 2016/03/09 20:10:43]

// Update quick launch and taskbar pins.

[fdoray, 2016/03/09 22:13:02]

This comment is no longer applicable.

+    UpdateShortcuts(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
+                    ShellUtil::CURRENT_USER, dist, target_path_prefix,
+                    target_path_suffix, target);
+  }
 }
 
 void RegisterChromeOnMachine(const installer::InstallerState& installer_state,