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

chrome/browser/web_applications/web_app_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/web_applications/web_app.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/icon_util.h"
 
 namespace {
 
 const FilePath::CharType kIconChecksumFileExt[] = FILE_PATH_LITERAL(".ico.md5");
 
@@ skipping 91 matching lines @@
       shortcut_paths.push_back(path);
     }
   }
 
   return shortcut_paths;
 }
 
 bool ShortcutIsForProfile(const FilePath& shortcut_file_name,
                           const FilePath& profile_path) {
   string16 cmd_line_string;
-  if (file_util::ResolveShortcut(shortcut_file_name, NULL, &cmd_line_string)) {
+  if (base::win::ResolveShortcut(shortcut_file_name, NULL, &cmd_line_string)) {
     cmd_line_string = L"program " + cmd_line_string;
     CommandLine shortcut_cmd_line = CommandLine::FromString(cmd_line_string);
     return shortcut_cmd_line.HasSwitch(switches::kProfileDirectory) &&
            shortcut_cmd_line.GetSwitchValuePath(switches::kProfileDirectory) ==
                profile_path.BaseName();
   }
 
   return false;
 }
 
@@ skipping 84 matching lines @@
   if (!web_app::internals::CheckAndSaveIcon(icon_file,
         *shortcut_info.favicon.ToSkBitmap())) {
     return false;
   }
 
   FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return false;
 
   // Working directory.
-  FilePath chrome_folder = chrome_exe.DirName();
+  FilePath chrome_folder(chrome_exe.DirName());
 
   CommandLine cmd_line(CommandLine::NO_PROGRAM);
   cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
       shortcut_info.extension_id, shortcut_info.profile_path);
 
   // TODO(evan): we rely on the fact that command_line_string() is
   // properly quoted for a Windows command line.  The method on
   // CommandLine should probably be renamed to better reflect that
   // fact.
   string16 wide_switches(cmd_line.GetCommandLineString());
 
   // Sanitize description
   string16 description = shortcut_info.description;
   if (description.length() >= MAX_PATH)
     description.resize(MAX_PATH - 1);
 
   // Generates app id from web app url and profile path.
-  std::string app_name =
-      web_app::GenerateApplicationNameFromInfo(shortcut_info);
-  string16 app_id = ShellIntegration::GetAppModelIdForProfile(
-      UTF8ToUTF16(app_name), shortcut_info.profile_path);
+  std::string app_name(web_app::GenerateApplicationNameFromInfo(shortcut_info));
+  string16 app_id(ShellIntegration::GetAppModelIdForProfile(
+      UTF8ToUTF16(app_name), shortcut_info.profile_path));
 
   FilePath shortcut_to_pin;
   bool success = true;
   for (size_t i = 0; i < shortcut_paths.size(); ++i) {
     FilePath shortcut_file = shortcut_paths[i].Append(file_name).
         ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
 
     int unique_number =
         file_util::GetUniquePathNumber(shortcut_file, FILE_PATH_LITERAL(""));
     if (unique_number == -1) {
       success = false;
       continue;
     } else if (unique_number > 0) {
       shortcut_file = shortcut_file.InsertBeforeExtensionASCII(
           StringPrintf(" (%d)", unique_number));
     }
 
-    success = file_util::CreateOrUpdateShortcutLink(
-        chrome_exe.value().c_str(),
-        shortcut_file.value().c_str(),
-        chrome_folder.value().c_str(),
-        wide_switches.c_str(),
-        description.c_str(),
-        icon_file.value().c_str(),
-        0,
-        app_id.c_str(),
-        file_util::SHORTCUT_CREATE_ALWAYS) && success;
+    base::win::ShortcutProperties shortcut_properties;
+    shortcut_properties.set_target(chrome_exe);
+    shortcut_properties.set_working_dir(chrome_folder);
+    shortcut_properties.set_arguments(wide_switches);
+    shortcut_properties.set_description(description);
+    shortcut_properties.set_icon(icon_file, 0);
+    shortcut_properties.set_app_id(app_id);
+    shortcut_properties.set_dual_mode(false);
+    success = base::win::CreateOrUpdateShortcutLink(
+        shortcut_file, shortcut_properties,
+        base::win::SHORTCUT_CREATE_ALWAYS) && success;
 
     // Any shortcut would work for the pinning. We use the first one.
     if (success && pin_to_taskbar && shortcut_to_pin.empty())
       shortcut_to_pin = shortcut_file;
   }
 
   if (success && pin_to_taskbar) {
     if (!shortcut_to_pin.empty()) {
-      success &= file_util::TaskbarPinShortcutLink(
+      success &= base::win::TaskbarPinShortcutLink(
           shortcut_to_pin.value().c_str());
     } else {
       success = false;
     }
   }
 
   return success;
 }
 
 void DeletePlatformShortcuts(
@@ skipping 13 matching lines @@
 
   for (std::vector<FilePath>::const_iterator i = shortcut_locations.begin();
        i != shortcut_locations.end(); ++i) {
     std::vector<FilePath> shortcut_files =
         MatchingShortcutsForProfileAndExtension(*i, shortcut_info.profile_path,
             shortcut_info.title);
     for (std::vector<FilePath>::const_iterator j = shortcut_files.begin();
          j != shortcut_files.end(); ++j) {
       // Any shortcut could have been pinned, either by chrome or the user, so
       // they are all unpinned.
-      file_util::TaskbarUnpinShortcutLink(j->value().c_str());
+      base::win::TaskbarUnpinShortcutLink(j->value().c_str());
       file_util::Delete(*j, false);
     }
   }
 }
 
 }  // namespace internals
 
 }  // namespace web_app