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

chrome/browser/ui/web_applications/web_app_ui.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/ui/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 240 matching lines @@
     // Generates app id from web app url and profile path.
     string16 app_id = ShellIntegration::GetAppModelIdForProfile(
         UTF8ToWide(web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
         profile_path_);
 
     // Sanitize description
     if (shortcut_info_.description.length() >= MAX_PATH)
       shortcut_info_.description.resize(MAX_PATH - 1);
 
     for (size_t i = 0; i < shortcut_files_.size(); ++i) {
+      file_util::ShortcutProperties shortcut_properties;
+      shortcut_properties.set_target(shortcut_files_[i].value());
+      shortcut_properties.set_description(shortcut_info_.description.c_str());
+      shortcut_properties.set_icon(icon_file.value(), 0);
+      shortcut_properties.set_app_id(app_id);
       file_util::CreateOrUpdateShortcutLink(
-          NULL,
           shortcut_files_[i].value().c_str(),
-          NULL,
-          NULL,
-          shortcut_info_.description.c_str(),
-          icon_file.value().c_str(),
-          0,
-          app_id.c_str(),
-          file_util::SHORTCUT_NO_OPTIONS);
+          shortcut_properties,
+          file_util::SHORTCUT_UPDATE_EXISTING);
     }
   }
 
   OnShortcutsUpdated(true);
 }
 
 void UpdateShortcutWorker::OnShortcutsUpdated(bool) {
   DeleteMe();  // We are done.
 }
 
@@ skipping 40 matching lines @@
 
 void UpdateShortcutForTabContents(TabContents* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app