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

chrome/installer/setup/setup_main.cc

Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index ad881c2fcc8b4eb62451416f7c43be0123776f92..7f6bf0ca5b9d828375e116c2cd802a904ccf5675 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -724,8 +724,10 @@ installer::InstallStatus InstallProductsHelper(
                    (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...

+          }
         }
       }
     }