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

chrome/browser/shell_integration_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/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 320 matching lines @@
     string16 expected_app_id;
     if (!GetExpectedAppId(chrome_exe, shell_link, &expected_app_id) ||
         expected_app_id.empty())
       continue;
 
     // Get existing app id from shortcut if any.
     string16 existing_app_id;
     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);
     }
   }
 }
 
 void MigrateChromiumShortcutsCallback() {
   // This should run on the file thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Get full path of chrome.
   FilePath chrome_exe;
@@ skipping 277 matching lines @@
       continue;
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name + L".lnk");
     if (file_util::PathExists(shortcut))
       return shortcut;
   }
 
   return FilePath();
 }