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

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 85e5fbd7d0f9e8123a5e2b2157810f3ad4ede95f..fe243cbc24887b54a777d939ad0b7701216b0da6 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -204,15 +204,28 @@ class ShellUtil {
   static void GetRegisteredBrowsers(BrowserDistribution* dist,
                                     std::map<string16, string16>* browsers);
 
-  // This function gets a suffix (user's login name) that can be added
-  // to Chromium default browser entry in the registry to create a unique name
-  // if there are multiple users on the machine, each with their own copy of
-  // Chromium that they want to set as default browser.
-  // This suffix value is assigned to |entry|. The function also checks for
-  // existence of Default Browser registry key with this suffix and
-  // returns true if it exists. In all other cases it returns false.
-  static bool GetUserSpecificDefaultBrowserSuffix(BrowserDistribution* dist,
-                                                  string16* entry);
+  // Returns the suffix this user's Chrome install is registered with.
+  // Note: this method returns the empty string on system-level installs by
+  // design as no system-level installs is ever suffixed.
+  //
+  // This method is meant for external methods which need to know the suffix of
+  // the current install at run-time, not for install-time decisions.
+  // There are no guarantees that this suffix will not change later:
+  // (e.g. if two user-level installs were previously installed in parallel on
+  // the same machine, both without admin rights and with no user-level install
+  // having claimed the non-suffixed HKLM registrations, they both have no
+  // suffix in their progId entries (as per the old suffix rules). If they were
+  // to both fully register (i.e. click "Make Chrome Default" and go through
+  // UAC; or upgrade to Win8 and get the automatic no UAC full registration)
+  // they would then both get a suffixed registration as per the new suffix
+  // rules).
+  static string16 GetCurrentInstallationSuffix();
+
+  // Returns true if any of the possible Chrome registry keys are present in

[grt (UTC plus 2), 2012/05/30 20:37:40]

according to the implementation: "any" -> "all"

[gab, 2012/05/31 06:36:01]

As mentionned on another comment, the intention is "any" and I messed up the
implementation before sending the CL...

+  // HKLM with |suffix|.
+  static bool IsInstallationPresentInHKLM(BrowserDistribution* dist,
+                                          const string16& chrome_exe,
+                                          const string16& suffix);
 
   // Make Chrome the default browser. This function works by going through
   // the url protocols and file associations that are related to general