Revert 174893 - Windows: Remove desktop profile shortcuts (and any others pointing to the exe) on uninstall.

BUG=146636
TEST=Uninstalling Chrome removes any present profile shortcuts on the desktop.

Review URL: https://chromiumcodereview.appspot.com/11693010

TBR=asvitkine@chromium.org
Review URL: https://codereview.chromium.org/11748010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174908 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 56cf0fc..a85890b 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -325,10 +325,10 @@ void CloseChromeFrameHelperProcess() {
 
 // Deletes shortcuts at |install_level| from Start menu, Desktop,
 // Quick Launch, taskbar, and secondary tiles on the Start Screen (Win8+).
-// Only shortcuts pointing to |target_exe| will be removed.
+// Only shortcuts pointing to |target| will be removed.
 void DeleteShortcuts(const InstallerState& installer_state,
                      const Product& product,
-                     const FilePath& target_exe) {
+                     const string16& target_exe) {
   BrowserDistribution* dist = product.distribution();
 
   // The per-user shortcut for this user, if present on a system-level install,
@@ -367,10 +367,10 @@ void DeleteShortcuts(const InstallerState& installer_state,
   // it is possible for shortcuts to remain pinned while their parent shortcut
   // has been deleted or changed to point to another |target_exe|. Make sure all
   // pinned-to-taskbar shortcuts that point to |target_exe| are unpinned.
-  ShellUtil::RemoveTaskbarShortcuts(target_exe.value());
+  ShellUtil::RemoveTaskbarShortcuts(target_exe);
 
   ShellUtil::RemoveStartScreenShortcuts(product.distribution(),
-                                        target_exe.value());
+                                        target_exe);
 }
 
 bool ScheduleParentAndGrandparentForDeletion(const FilePath& path) {
@@ -1128,13 +1128,14 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     auto_launch_util::DisableAllAutoStartFeatures(
         ASCIIToUTF16(chrome::kInitialProfile));
 
-    DeleteShortcuts(installer_state, product, FilePath(chrome_exe));
+    DeleteShortcuts(installer_state, product, chrome_exe);
 
   } else if (product.is_chrome_app_host()) {
     // TODO(huangs): Remove this check once we have system-level App Host.
     DCHECK(!installer_state.system_install());
-    const FilePath app_host_exe(
-        installer_state.target_path().Append(installer::kChromeAppHostExe));
+    const string16 app_host_exe(
+        installer_state.target_path().Append(installer::kChromeAppHostExe)
+            .value());
     DeleteShortcuts(installer_state, product, app_host_exe);
   }