Always suffix ChromeHTML entries on Windows for user-level installs.

chrome/installer/setup/uninstall.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 declares Chrome uninstall related functions.
 
 #ifndef CHROME_INSTALLER_SETUP_UNINSTALL_H_
 #define CHROME_INSTALLER_SETUP_UNINSTALL_H_
 #pragma once
 
@@ skipping 17 matching lines @@
 // |root| is the registry root (HKLM|HKCU) and |browser_entry_suffix| is the
 // suffix for default browser entry name in the registry (optional).
 bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
                                   const string16& browser_entry_suffix,
                                   const FilePath& target_path,
                                   InstallStatus* exit_code);
 
 // Removes any legacy registry keys from earlier versions of Chrome that are no
 // longer needed. This is used during autoupdate since we don't do full
 // uninstalls/reinstalls to update.
-void RemoveChromeLegacyRegistryKeys(BrowserDistribution* dist);
+void RemoveChromeLegacyRegistryKeys(BrowserDistribution* dist,
+                                    const string16& chrome_exe);
 
 // This function uninstalls a product.  Hence we came up with this awesome
 // name for it.
 //
 // original_state: The installation state of all products on the system.
 // installer_state: State associated with this operation.
 // setup_path: Path to the executable (setup.exe) as it will be copied
 //           to temp folder before deleting Chrome folder.
 // dist: Represents the distribution to be uninstalled.
 // remove_all: Remove all shared files, registry entries as well.
 // force_uninstall: Uninstall without prompting for user confirmation or
 //                  any checks for Chrome running.
 // cmd_line: CommandLine that contains information about the command that
 //           was used to launch current uninstaller.
 installer::InstallStatus UninstallProduct(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const FilePath& setup_path,
     const Product& dist,
     bool remove_all,
     bool force_uninstall,
     const CommandLine& cmd_line);
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_UNINSTALL_H_