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

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 7cdb24e6ce5da826635c27882e9ea772c1d06200..ed02208e5b62e54cff3043298cc28d24530f0524 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -338,10 +338,11 @@ void MigrateWin7ShortcutsInPath(
     GetShortcutAppId(shell_link, &existing_app_id);
 
     if (expected_app_id != existing_app_id) {
-      file_util::CreateOrUpdateShortcutLink(NULL, shortcut.value().c_str(),
-                                            NULL, NULL, NULL, NULL, 0,
-                                            expected_app_id.c_str(),
-                                            file_util::SHORTCUT_NO_OPTIONS);
+      file_util::ShortcutProperties properties_app_id_only;
+      properties_app_id_only.set_app_id(expected_app_id);
+      file_util::CreateOrUpdateShortcutLink(
+          shortcut.value().c_str(), properties_app_id_only,
+          file_util::SHORTCUT_UPDATE_EXISTING);
     }
   }
 }