Give SxS distribution its own registration GUIDs.

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 8693dfa834d46f353876cf4909977a942142f695..b104828208b7319546c26f21e001c42cae1dcf05 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -736,7 +736,9 @@ void RemoveFiletypeRegistration(const InstallerState& installer_state,
   string16 classes_path(ShellUtil::kRegClasses);
   classes_path.push_back(base::FilePath::kSeparators[0]);
 
-  const string16 prog_id(ShellUtil::kChromeHTMLProgId + browser_entry_suffix);
+  BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
+  const string16 prog_id(distribution->GetBrowserProgIdPrefix() +
+      browser_entry_suffix);

[gab, 2013/09/10 19:08:57]

nit: Align 4 spaces in from above '('

[zturner, 2013/09/11 21:16:59]

Thought this looked awkward, instead I put the entire expression on the
following line.  Let me know if there's a problem with this.

[gab, 2013/09/11 21:26:29]

Yep, prefer this too.

 
   // Delete each filetype association if it references this Chrome.  Take care
   // not to delete the association if it references a system-level install of
@@ -809,7 +811,8 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
   base::FilePath chrome_exe(installer_state.target_path().Append(kChromeExe));
 
   // Delete Software\Classes\ChromeHTML.
-  const string16 prog_id(ShellUtil::kChromeHTMLProgId + browser_entry_suffix);
+  const string16 prog_id(dist->GetBrowserProgIdPrefix() +
+      browser_entry_suffix);

[gab, 2013/09/10 19:08:57]

nit: Align 4 spaces in from above '('

[zturner, 2013/09/11 21:16:59]

Same

   string16 reg_prog_id(ShellUtil::kRegClasses);
   reg_prog_id.push_back(base::FilePath::kSeparators[0]);
   reg_prog_id.append(prog_id);