Change shortcut install location to non-subdir.

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 a076ca3a6efbd8ed4e23c021e2b10544f10d851c..1b1494eccd1d8acd01813ee718181fd719bf41f6 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -70,6 +70,9 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location,
     case ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH:
       message.append("Quick Launch ");
       break;
+    case ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT:
+      message.append("Start menu ");
+      break;
     case ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR:
       message.append("Start menu/" +
                      base::UTF16ToUTF8(dist->GetStartMenuShortcutSubfolder(
@@ -116,7 +119,7 @@ void LogShortcutOperation(ShellUtil::ShortcutLocation location,
     VLOG(1) << message;
 }
 
-void ExecuteAndLogShortcutOperation(
+bool ExecuteAndLogShortcutOperation(
     ShellUtil::ShortcutLocation location,
     BrowserDistribution* dist,
     const ShellUtil::ShortcutProperties& properties,
@@ -125,7 +128,9 @@ void ExecuteAndLogShortcutOperation(
   if (!ShellUtil::CreateOrUpdateShortcut(location, dist, properties,
                                          operation)) {
     LogShortcutOperation(location, dist, properties, operation, true);
+    return false;
   }
+  return true;
 }
 
 void AddChromeToMediaPlayerList() {
@@ -434,8 +439,24 @@ void CreateOrUpdateShortcuts(
     // remains disabled long term.
     start_menu_properties.set_pin_to_start(false);
   }
-  ExecuteAndLogShortcutOperation(
+
+  // We're migrating from shortcuts in a subdirectory to being directly in
+  // the list of "All Programs" which means the update may fail because it's
+  // not currently in the location we want it to go.  In this case, we have
+  // to explicitly remove the old one and force-create the new one.

[gab, 2015/10/13 19:35:09]

Suggest changing this whole paragraph with something like:

// Move Start Menu shortcuts out of the deprecated chrome specific subfolder if
it exists. This needs to happen before the shortcut update below or it will
fail.

[bcwhite, 2015/10/15 18:29:35]

Done.

+  base::FilePath old_shortcut_path;
+  ShellUtil::GetShortcutPath(
       ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, dist,
+      shortcut_level, &old_shortcut_path);
+  if (base::PathExists(old_shortcut_path)) {
+    ShellUtil::MoveExistingShortcut(
+        shortcut_level, dist, start_menu_properties,
+        ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,

[gab, 2015/10/13 19:35:09]

Rename SHORTCUT_LOCATION_START_MENU_CHROME_DIR to
SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED to ensure that all affected
call sites are dealt with in this CL (and also for future documentation).

[bcwhite, 2015/10/15 18:29:35]

Done.

+        ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT);
+  }

[gab, 2015/10/13 19:35:09]

Also need to delete the subfolder on success.

I suggest changing MoveExistingShortcut() to MigrateShortcuts(old_dir, new_dir,
...). Which would move all existing shortcuts in |old_dir| out to the |new_dir|
and then delete |old_dir|.

[bcwhite, 2015/10/15 18:29:35]

Generally there is only the one but should there be others, say "uninstall
Chrome", from some long-ago install, should we really move that to the root
directory?  I think those would be better left under the sub-folder to avoid
clutter.

[gab, 2015/10/15 18:55:06]

I really think we should aim to delete the subfolder. And thus we should
probably move everything (e.g. potential custom shortcuts, etc.) out.

I'm not worried about the uninstall link (in fact we removed the cleanup code
for it recently, 2 years after its deprecation).
And on uninstall we nuke every shortcut that points to chrome.exe in known
locations so a simple uninstall should get rid of any weird cruft for unhappy
users (actually the uninstall link points to setup.exe but we could also add a
rule to clean those up if we care).

Edit: I just saw that you added logic to delete the folder if empty after the
move (e.g. the common case). Maybe that's actually better. Hmmm, @grt: WDYT?

[grt (UTC plus 2), 2015/10/19 17:28:44]

Hmm. I think leaving old custom shortcuts in the directory is probably best.
This satisfies the "minimize user surprise" goal of software. I like that the
old directory is removed when it's empty.

+
+  ExecuteAndLogShortcutOperation(
+      ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist,
       start_menu_properties, shortcut_operation);
 }