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

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
+#include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/install_worker.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/util/auto_launch_util.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 268 matching lines @@
     LOG(ERROR) << "Failed to get location for shortcut.";
   } else {
     const string16 product_name(product.distribution()->GetAppShortCutName());
     shortcut_path = shortcut_path.Append(product_name);
 
     FilePath shortcut_link(shortcut_path.Append(product_name + L".lnk"));
 
     VLOG(1) << "Unpinning shortcut at " << shortcut_link.value()
             << " from taskbar";
     // Ignore return value: keep uninstalling if the unpin fails.
-    file_util::TaskbarUnpinShortcutLink(shortcut_link.value().c_str());
+    base::win::TaskbarUnpinShortcutLink(shortcut_link.value().c_str());
 
     VLOG(1) << "Deleting shortcut " << shortcut_path.value();
     if (!file_util::Delete(shortcut_path, true))
       LOG(ERROR) << "Failed to delete folder: " << shortcut_path.value();
   }
 
   ShellUtil::RemoveChromeStartScreenShortcuts(product.distribution(),
                                               chrome_exe);
 }
 
@@ skipping 878 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer