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

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 231 matching lines @@
   DeleteRegistryKey(key, dist->GetVersionKey());
 
   // Delete Software\Classes\ChromeHTML,
   // Software\Clients\StartMenuInternet\chrome.exe and
   // Software\RegisteredApplications\Chrome
   std::wstring html_prog_id(ShellUtil::kRegClasses);
   file_util::AppendToPath(&html_prog_id, ShellUtil::kChromeHTMLProgId);
   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());
 
   // Cleanup Software\Classes\Applications\chrome.exe and OpenWithList
   RegKey hklm_key(HKEY_LOCAL_MACHINE, L"", KEY_ALL_ACCESS);
   std::wstring app_key(ShellUtil::kRegClasses);
   file_util::AppendToPath(&app_key, L"Applications");
   file_util::AppendToPath(&app_key, installer_util::kChromeExe);
   DeleteRegistryKey(key, app_key);
@@ skipping 54 matching lines @@
     dist->DoPostUninstallOperations(installed_version, local_state_path);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!local_state_path.empty())
     file_util::Delete(local_state_path, false);
 
   return installer_util::UNINSTALL_SUCCESSFUL;
 }