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

chrome/browser/chrome_browser_main_win.cc

Index: chrome/browser/chrome_browser_main_win.cc
===================================================================
--- chrome/browser/chrome_browser_main_win.cc	(revision 174984)
+++ chrome/browser/chrome_browser_main_win.cc	(working copy)
@@ -135,9 +135,6 @@
     VLOG(1) << "Executing uninstall actions";
     if (!first_run::RemoveSentinel())
       VLOG(1) << "Failed to delete sentinel file.";
-    // We want to remove user level shortcuts and we only care about the ones
-    // created by us and not by the installer so |alternate| is false.
-    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     FilePath chrome_exe;
     if (PathService::Get(base::FILE_EXE, &chrome_exe)) {
       ShellUtil::ShortcutLocation user_shortcut_locations[] = {
@@ -145,15 +142,15 @@
         ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
         ShellUtil::SHORTCUT_LOCATION_START_MENU,
       };
+      BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       for (size_t i = 0; i < arraysize(user_shortcut_locations); ++i) {
-        if (!ShellUtil::RemoveShortcut(
-                user_shortcut_locations[i], dist, chrome_exe.value(),
-                ShellUtil::CURRENT_USER, NULL)) {
+        if (!ShellUtil::RemoveShortcut(user_shortcut_locations[i], dist,
+                                       chrome_exe, ShellUtil::CURRENT_USER,
+                                       NULL)) {
           VLOG(1) << "Failed to delete shortcut at location "
                   << user_shortcut_locations[i];
         }
       }
-      // TODO(rlp): Cleanup profiles shortcuts.
     } else {
       NOTREACHED();
     }