Revert 165505 - Introduce RemoveChromeTaskbarShortcuts() to delete all pinned-to-taskbar shortcuts …

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>
 
@@ skipping 289 matching lines @@
     LOG(WARNING) << "Failed to delete Quick Launch shortcut.";
   }
 
   VLOG(1) << "Deleting Start Menu shortcuts.";
   if (!ShellUtil::RemoveChromeShortcut(
           ShellUtil::SHORTCUT_START_MENU, dist, chrome_exe, install_level,
           NULL)) {
     LOG(WARNING) << "Failed to delete Start Menu shortcuts.";
   }
 
-  // Although the shortcut removal calls above will unpin their shortcut if they
-  // result in a deletion (i.e. shortcut existed and pointed to |chrome_exe|),
-  // it is possible for shortcuts to remain pinned while their parent shortcut
-  // has been deleted or changed to point to another |chrome_exe|. Make sure all
-  // pinned-to-taskbar shortcuts that point to |chrome_exe| are unpinned.
-  ShellUtil::RemoveChromeTaskbarShortcuts(chrome_exe);
-
   ShellUtil::RemoveChromeStartScreenShortcuts(product.distribution(),
                                               chrome_exe);
 }
 
 bool ScheduleParentAndGrandparentForDeletion(const FilePath& path) {
   FilePath parent_dir = path.DirName();
   bool ret = ScheduleFileSystemEntityForDeletion(parent_dir.value().c_str());
   if (!ret) {
     LOG(ERROR) << "Failed to schedule parent dir for deletion: "
                << parent_dir.value();
@@ skipping 945 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