Fix the path of shortcuts with an icon in the current install dir.

chrome/installer/setup/install.h

 // 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 contains the specification of setup main functions.
 
 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_
 #define CHROME_INSTALLER_SETUP_INSTALL_H_
 
 #include <vector>
@@ skipping 33 matching lines @@
 enum InstallShortcutLevel {
   // Install shortcuts for the current user only.
   CURRENT_USER,
   // Install global shortcuts visible to all users. Note: the Quick Launch
   // and taskbar pin shortcuts are still installed per-user (as they have no
   // all-users version).
   ALL_USERS,
 };
 
 // Sets |new_target_path| as the new target path of all shortcuts in the
-// location specified by |shortcut_location| and |dist| which point to a file:
-// - In |old_target_dir| or one of its subdirectories, and,
-// - Whose path ends with |old_target_path_suffix|.
+// location specified by |shortcut_location| and |dist| which either:
+// - Point to a file rooted at |old_target_dir| whose name ends in
+//   |old_target_name_suffix|, or,
+// - Have an icon rooted at |old_target_dir|.
 void UpdatePerUserShortcutsInLocation(
     const ShellUtil::ShortcutLocation shortcut_location,
     BrowserDistribution* dist,
     const base::FilePath& old_target_dir,
-    const base::FilePath& old_target_path_suffix,
+    const base::FilePath& old_target_name_suffix,
     const base::FilePath& new_target_path);
 
 // Escape |att_value| as per the XML AttValue production
 // (http://www.w3.org/TR/2008/REC-xml-20081126/#NT-AttValue) for a value in
 // single quotes.
 void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value);
 
 // Creates VisualElementsManifest.xml beside chrome.exe in |src_path| if
 // |src_path|\VisualElements exists.
 // Returns true unless the manifest is supposed to be created, but fails to be.
@@ skipping 70 matching lines @@
 // Shortcut creation is skipped if the First Run beacon is present (unless
 // |force| is set to true).
 // |chrome| The installed product (must be a browser).
 void HandleActiveSetupForBrowser(const base::FilePath& installation_root,
                                  const Product& chrome,
                                  bool force);
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_INSTALL_H_