Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe…

chrome/browser/chrome_browser_main_win.cc

Index: chrome/browser/chrome_browser_main_win.cc
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index a03619dade95264634bcf9a49ca3509a770c3ad3..a1f64da66d90a320afa8f5c534ec5cb86abc55ab 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -128,13 +128,13 @@ int DoUninstallTasks(bool chrome_still_running) {
     // 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();
-    if (!ShellUtil::RemoveChromeDesktopShortcut(
-            dist, ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_NO_OPTIONS)) {
+    if (!ShellUtil::RemoveChromeShortcut(ShellUtil::SHORTCUT_DESKTOP, dist,
+                                         ShellUtil::SHORTCUT_NO_OPTIONS)) {
       VLOG(1) << "Failed to delete desktop shortcut.";
     }
     // TODO(hallielaine): Cleanup profiles shortcuts.
-    if (!ShellUtil::RemoveChromeQuickLaunchShortcut(dist,
-                                                    ShellUtil::CURRENT_USER)) {
+    if (!ShellUtil::RemoveChromeShortcut(ShellUtil::SHORTCUT_QUICK_LAUNCH, dist,
+                                         ShellUtil::SHORTCUT_NO_OPTIONS)) {
       VLOG(1) << "Failed to delete quick launch shortcut.";
     }
   }