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

chrome/browser/profiles/profile_shortcut_manager_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 180 matching lines @@
   description = WideToUTF16(dist->GetAppDescription());
 
   // Add the profile to the map if it doesn't exist already
   if (!profile_shortcuts_.count(profile_path)) {
     string16 flags = CreateProfileShortcutFlags(profile_path);
     profile_shortcuts_.insert(std::make_pair(profile_path,
                               ProfileShortcutInfo(flags, profile_name,
                                   avatar_image)));
   }
 
-  ShellUtil::CreateChromeDesktopShortcut(
+  ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_DESKTOP,
       dist,
       chrome_exe.value(),
       description,
       profile_shortcuts_[profile_path].profile_name,
       profile_shortcuts_[profile_path].flags,
       shortcut_icon.empty() ? chrome_exe.value() : shortcut_icon.value(),
       shortcut_icon.empty() ? dist->GetIconIndex() : 0,
-      ShellUtil::CURRENT_USER,
       ShellUtil::SHORTCUT_CREATE_ALWAYS);
 }
 
 void ProfileShortcutManagerWin::DeleteChromeDesktopShortcut(
     const FilePath& profile_path) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   string16 shortcut;
   // If we can find the shortcut, delete it
-  if (ShellUtil::GetChromeShortcutName(dist, false,
-      profile_shortcuts_[profile_path].profile_name, &shortcut)) {
+  if (ShellUtil::GetChromeShortcutName(
+          ShellUtil::SHORTCUT_DESKTOP, dist, false,
+          profile_shortcuts_[profile_path].profile_name, &shortcut)) {
     std::vector<string16> appended_names(1, shortcut);
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
             base::Bind(&CallShellUtilBoolFunction, base::Bind(
                 &ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames,
                 appended_names)));
     profile_shortcuts_.erase(profile_path);
   }
 }
-