Windows: Remove desktop profile shortcuts (and any others pointing to the exe) on uninstall.

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
===================================================================
--- chrome/installer/setup/uninstall.cc	(revision 174803)
+++ chrome/installer/setup/uninstall.cc	(working copy)
@@ -325,10 +325,10 @@
 
 // Deletes shortcuts at |install_level| from Start menu, Desktop,
 // Quick Launch, taskbar, and secondary tiles on the Start Screen (Win8+).
-// Only shortcuts pointing to |target| will be removed.
+// Only shortcuts pointing to |target_exe| will be removed.
 void DeleteShortcuts(const InstallerState& installer_state,
                      const Product& product,
-                     const string16& target_exe) {
+                     const FilePath& target_exe) {
   BrowserDistribution* dist = product.distribution();
 
   // The per-user shortcut for this user, if present on a system-level install,
@@ -1063,8 +1063,9 @@
                                const CommandLine& cmd_line) {
   InstallStatus status = installer::UNINSTALL_CONFIRMED;
   BrowserDistribution* browser_dist = product.distribution();
-  const string16 chrome_exe(
-      installer_state.target_path().Append(installer::kChromeExe).value());
+  const FilePath chrome_exe_path(

[gab, 2013/01/02 16:12:49]

We have an item on the installer fixit list
(https://docs.google.com/a/google.com/document/d/1Js17FLROy5L83Q8Qp9G6l6hRq1fH...)
already to convert all of these string16 paths to FilePaths; not sure I like the
in between state here -- i.e. in the ideal world all of these variables would
still be name *_exe (not *_exe_path; I don't like the unnecessary extended
variable name).

For now what about leaving chrome_exe as a string16 and inlining
FilePath(chrome_exe) below -- as it is only needed once for now anyways?

[Alexei Svitkine (slow), 2013/01/02 16:15:25]

Done.

+      installer_state.target_path().Append(installer::kChromeExe));
+  const string16 chrome_exe(chrome_exe_path.value());
 
   const string16 suffix(ShellUtil::GetCurrentInstallationSuffix(browser_dist,
                                                                 chrome_exe));
@@ -1128,15 +1129,14 @@
     auto_launch_util::DisableAllAutoStartFeatures(
         ASCIIToUTF16(chrome::kInitialProfile));
 
-    DeleteShortcuts(installer_state, product, chrome_exe);
+    DeleteShortcuts(installer_state, product, chrome_exe_path);
 
   } else if (product.is_chrome_app_host()) {
     // TODO(huangs): Remove this check once we have system-level App Host.
     DCHECK(!installer_state.system_install());
-    const string16 app_host_exe(
-        installer_state.target_path().Append(installer::kChromeAppHostExe)
-            .value());
-    DeleteShortcuts(installer_state, product, app_host_exe);
+    const FilePath app_host_exe_path(

[gab, 2013/01/02 16:12:49]

I'd prefer keeping the "app_host_exe" name here.

[Alexei Svitkine (slow), 2013/01/02 16:15:25]

Done.

+        installer_state.target_path().Append(installer::kChromeAppHostExe));
+    DeleteShortcuts(installer_state, product, app_host_exe_path);
   }
 
   // Delete the registry keys (Uninstall key and Version key).