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

chrome/installer/setup/setup_main.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.
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 706 matching lines @@
             prefs.GetBool(
                 installer::master_preferences::kDoNotLaunchChrome,
                 &do_not_launch_chrome);
             if (!system_install && !do_not_launch_chrome)
               chrome_install->LaunchChrome(installer_state.target_path());
           }
         } else if ((install_status == installer::NEW_VERSION_UPDATED) ||
                    (install_status == installer::IN_USE_UPDATED)) {
           const Product* chrome = installer_state.FindProduct(
               BrowserDistribution::CHROME_BROWSER);
-          if (chrome != NULL)
-            installer::RemoveChromeLegacyRegistryKeys(chrome->distribution());
+          if (chrome != NULL) {
+            installer::RemoveChromeLegacyRegistryKeys(chrome->distribution(),
+                                                      chrome_exe);

[grt (UTC plus 2), 2012/06/08 17:51:46]

i don't think this |chrome_exe| is what you think it is.

[gab, 2012/06/08 20:15:52]

Ah right, it was quoted above, good catch, fixed... which leads us  into the
string16 dance...

+          }
         }
       }
     }
 
     // There might be an experiment (for upgrade usually) that needs to happen.
     // An experiment's outcome can include chrome's uninstallation. If that is
     // the case we would not do that directly at this point but in another
     // instance of setup.exe
     //
     // There is another way to reach this same function if this is a system
@@ skipping 645 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }