Change shortcut install location to non-subdir.

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 5b35e1185ce36f38aed6962fecd9b8ffd16e881b..46a8998072a6b9e5da273d42703074360b297bf5 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -54,7 +54,7 @@ class ShellUtil {
     SHORTCUT_LOCATION_DESKTOP = SHORTCUT_LOCATION_FIRST,
     SHORTCUT_LOCATION_QUICK_LAUNCH,
     SHORTCUT_LOCATION_START_MENU_ROOT,
-    SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
+    SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,  // now placed in root
     SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR,
     SHORTCUT_LOCATION_TASKBAR_PINS,  // base::win::VERSION_WIN7 +
     SHORTCUT_LOCATION_APP_SHORTCUTS,  // base::win::VERSION_WIN8 +
@@ -330,6 +330,15 @@ class ShellUtil {
                               ShellChange level,
                               base::FilePath* path);
 
+  // Move an existing shortcut from |old_location| to |new_location| for the
+  // set |shortcut_level|.

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

please add to the comment that the folder at |old_location| is removed if it is
empty after the move.

[bcwhite, 2015/10/20 16:02:13]

Done.

+  static bool ShellUtil::MoveExistingShortcut(

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

could you add a unittest for this?

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

remove ShellUtil::

[bcwhite, 2015/10/20 16:02:13]

Done.

[bcwhite, 2015/10/20 16:02:13]

Done.  (here and elsewhere)

+      ShellUtil::ShortcutLocation old_location,
+      ShellUtil::ShortcutLocation new_location,
+      BrowserDistribution* dist,
+      ShellUtil::ShellChange shortcut_level,
+      const ShellUtil::ShortcutProperties& properties);
+
   // Updates shortcut in |location| (or creates it if |options| specify
   // SHELL_SHORTCUT_CREATE_ALWAYS).
   // |dist| gives the type of browser distribution currently in use.