Suffix Chrome's appid on user-level installs

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <vector>
 
@@ skipping 515 matching lines @@
   // well anyways.
   string16 html_prog_id(ShellUtil::kRegClasses);
   html_prog_id.push_back(FilePath::kSeparators[0]);
   html_prog_id.append(ShellUtil::kChromeHTMLProgId);
   html_prog_id.append(browser_entry_suffix);
   InstallUtil::DeleteRegistryKey(root, html_prog_id);
 
   // Delete Software\Classes\Chrome (Same comment as above applies for this too)
   string16 chrome_app_id(ShellUtil::kRegClasses);
   chrome_app_id.push_back(FilePath::kSeparators[0]);
-  chrome_app_id.append(dist->GetBrowserAppId());
+  if (browser_entry_suffix.empty()) {
+    // An unsuffixed appid used to be registered on some user-level install
+    // (dev-channel 21.0.1171.0). Make sure it gets cleaned up here.
+    // Note: this couldn't be cleaned on update as a currently running old
+    // chrome might still be using the unsuffixed appid when the registration
+    // update steps run.
+    InstallUtil::DeleteRegistryKey(root, chrome_app_id + dist->GetBaseAppId());
+  }
+  chrome_app_id.append(ShellUtil::GetBrowserModelId(dist, chrome_exe.value()));
   InstallUtil::DeleteRegistryKey(root, chrome_app_id);
 
   // Delete all Start Menu Internet registrations that refer to this Chrome.
   {
     using base::win::RegistryKeyIterator;
     InstallUtil::ProgramCompare open_command_pred(chrome_exe);
     string16 client_name;
     string16 client_key;
     string16 open_key;
     for (RegistryKeyIterator iter(root, ShellUtil::kRegStartMenuInternet);
@@ skipping 402 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer