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

chrome/browser/first_run/first_run_win.cc

Index: chrome/browser/first_run/first_run_win.cc
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index fbd92bc10deb3388779a0d1f4a4d685a8d06236d..e4037f6560c324d6738f4b3d759124e631a85106 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -111,16 +111,12 @@ bool CreateChromeDesktopShortcut() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (!dist || !dist->CanCreateDesktopShortcuts())
     return false;
-  return ShellUtil::CreateChromeDesktopShortcut(
-      dist,
-      chrome_exe.value(),
-      dist->GetAppDescription(),
-      L"",
-      L"",
-      chrome_exe.value(),
-      dist->GetIconIndex(),
-      ShellUtil::CURRENT_USER,
-      ShellUtil::SHORTCUT_CREATE_ALWAYS);
+  ShellUtil::ChromeShortcutProperties shortcut_properties(
+      ShellUtil::CURRENT_USER);
+  shortcut_properties.set_chrome_exe(chrome_exe);
+  return ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_DESKTOP, dist, shortcut_properties,
+      ShellUtil::SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL);
 }
 
 // Creates the quick launch shortcut to chrome for the current user. Returns
@@ -130,11 +126,12 @@ bool CreateChromeQuickLaunchShortcut() {
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return false;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  return ShellUtil::CreateChromeQuickLaunchShortcut(
-      dist,
-      chrome_exe.value(),
-      ShellUtil::CURRENT_USER,  // create only for current user.
-      ShellUtil::SHORTCUT_CREATE_ALWAYS);
+  ShellUtil::ChromeShortcutProperties shortcut_properties(
+      ShellUtil::CURRENT_USER);
+  shortcut_properties.set_chrome_exe(chrome_exe);
+  return ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_QUICK_LAUNCH, dist, shortcut_properties,
+      ShellUtil::SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL);
 }
 
 void PlatformSetup(Profile* profile) {