Refactoring and tests for the highly undertested file_util::CreateOrUpdateShortcutLink() method.

chrome/installer/setup/install.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/installer/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 #include <winuser.h>
 
@@ skipping 309 matching lines @@
   // Add/Remove Programs dialog.
   // TODO(robertshield): We could add a shortcut to msiexec /X {GUID} here.
   if (!installer_state.is_msi()) {
     // Uninstall Chrome link
     FilePath uninstall_link(start_menu_folder_path.Append(
         browser_dist->GetUninstallLinkName() + L".lnk"));
 
     CommandLine arguments(CommandLine::NO_PROGRAM);
     AppendUninstallCommandLineFlags(installer_state, product, &arguments);
     VLOG(1) << operation << " uninstall link at " << uninstall_link.value();
-    if (!file_util::CreateOrUpdateShortcutLink(setup_exe.value().c_str(),
-            uninstall_link.value().c_str(), NULL,
-            arguments.GetCommandLineString().c_str(), NULL,
-            setup_exe.value().c_str(), 0, NULL,
+    file_util::ShortcutProperties shortcut_properties;
+    shortcut_properties.set_target(setup_exe.value());
+    shortcut_properties.set_arguments(arguments.GetCommandLineString());
+    shortcut_properties.set_icon(setup_exe.value(), 0);
+    if (!file_util::CreateOrUpdateShortcutLink(
+            uninstall_link.value().c_str(), shortcut_properties,
             create_always ? file_util::SHORTCUT_CREATE_ALWAYS :
-                            file_util::SHORTCUT_NO_OPTIONS)) {
+                            file_util::SHORTCUT_UPDATE_EXISTING)) {
       LOG(WARNING) << operation << " uninstall link at "
                    << uninstall_link.value() << " failed.";
     }
   }
 }
 
 void CreateOrUpdateDesktopAndQuickLaunchShortcuts(
     const InstallerState& installer_state,
     const Product& product,
     uint32 options) {
@@ skipping 217 matching lines @@
     uint32 shortcut_options = ShellUtil::SHORTCUT_DUAL_MODE;
     CreateOrUpdateDesktopAndQuickLaunchShortcuts(
         installer_state, chrome, shortcut_options);
     CreateOrUpdateStartMenuAndTaskbarShortcuts(
         installer_state, setup_exe, chrome, shortcut_options);
     RegisterChromeOnMachine(installer_state, chrome, false);
   }
 }
 
 }  // namespace installer