Fix shortcut tests and remove legacy shortcut code.

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 5ba26087664540a6a168744ccdebc089b9bd8b24..b79a563f397088beca5b861ae3c46309b679dd79 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -244,30 +244,6 @@ installer::InstallStatus InstallNewVersion(
   return installer::INSTALL_FAILED;
 }
 
-// Deletes the old "Uninstall Google Chrome" shortcut in the Start menu and, if
-// this is a system-level install, also deletes the old Default user Quick
-// Launch shortcut. Both of these were created prior to Chrome 24; in Chrome 24,
-// the uninstall shortcut was removed and the Default user Quick Launch shortcut
-// was replaced by per-user shortcuts created via Active Setup.
-void CleanupLegacyShortcuts(const installer::InstallerState& installer_state,

[grt (UTC plus 2), 2014/08/04 18:27:08]

this is still run on a surprising number of updates from old versions. i don't
think removing it altogether is the right thing. can some cleanups take place
while still leaving a function to remove old legacy shortcuts?

[gab, 2014/08/04 18:57:08]

Why do you think this is the case? Google Update data?
We typically leave migration code in Chrome for 2-3 milestones; this code has
been here for 14 milestones I think it's more than time to remove it...

(the side-effect of someone not running this code is only that they may be left
with (1) an uninstall link in the Start Menu and (2) a Quick Launch link in the
Default user profile which doesn't matter, it's just that we wanted to go away
from using the Default user because Active Setup is better)

[grt (UTC plus 2), 2014/08/04 19:05:51]

If there is a policy for this (I'm not aware of one), it should be made based on
data. What's the justification for 2-3 milestones? What's the cutoff guideline
that we use for choosing 2-3 over 3-4 or 15-20?

[gab, 2014/08/04 20:22:51]

This is what we do in prefs when deprecating prefs (deprecate them, leaving only
clearing code with a TODO to remove it altogether 3 milestones later).
I don't know what it's based on, just the trend I've seen around Chrome and have
picked up myself (w/ many reviews lgtm'ed by other Chromites where I have a
TODO(gab): Remove this in MXX -- where XX = trunk + 3).

-                            BrowserDistribution* dist,
-                            const base::FilePath& chrome_exe) {
-  ShellUtil::ShellChange shortcut_level = installer_state.system_install() ?
-      ShellUtil::SYSTEM_LEVEL : ShellUtil::CURRENT_USER;
-  base::FilePath uninstall_shortcut_path;
-  ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
-                             dist, shortcut_level, &uninstall_shortcut_path);
-  uninstall_shortcut_path = uninstall_shortcut_path.Append(
-      dist->GetUninstallLinkName() + installer::kLnkExt);
-  base::DeleteFile(uninstall_shortcut_path, false);
-
-  if (installer_state.system_install()) {
-    ShellUtil::RemoveShortcuts(
-        ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist,
-        ShellUtil::SYSTEM_LEVEL, chrome_exe);
-  }
-}
-
 // Returns the appropriate shortcut operations for App Launcher,
 // based on state of installation and master_preferences.
 installer::InstallShortcutOperation GetAppLauncherShortcutOperation(
@@ -562,7 +538,6 @@ InstallStatus InstallOrUpdateProduct(
       BrowserDistribution* chrome_dist = chrome_product->distribution();
       const base::FilePath chrome_exe(
           installer_state.target_path().Append(kChromeExe));
-      CleanupLegacyShortcuts(installer_state, chrome_dist, chrome_exe);
 
       // Install per-user shortcuts on user-level installs and all-users
       // shortcuts on system-level installs. Note that Active Setup will take