Avoid Google Chrome/Chromium default browser conflict by renaming Capabilities key.

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 138f1da52192a536a10a3d6f1dcb5e5e37a2ff2d..d0b65ae1584f9f2f1ecad65728cacd2b9bc52772 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -249,8 +249,14 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
   DeleteRegistryKey(key, html_prog_id);
 
   std::wstring set_access_key(ShellUtil::kRegStartMenuInternet);
-  file_util::AppendToPath(&set_access_key, installer_util::kChromeExe);
+  file_util::AppendToPath(&set_access_key, dist->GetApplicationName());
   DeleteRegistryKey(key, set_access_key);
+  // We have renamed the StartMenuInternet\chrome.exe to
+  // StartMenuInternet\Chromium so for old users we still need to delete
+  // the old key.
+  std::wstring old_set_access_key(ShellUtil::kRegStartMenuInternet);
+  file_util::AppendToPath(&old_set_access_key, installer_util::kChromeExe);
+  DeleteRegistryKey(key, old_set_access_key);
 
   DeleteRegistryValue(reg_root, ShellUtil::kRegRegisteredApplications,
                       dist->GetApplicationName());