Fix bugs related to making Chrome default browser on Vista.

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 239 matching lines @@
   // Delete shared registry keys as well (these require admin rights) if
   // remove_all option is specified.
   if (remove_all) {
     DeleteRegistryKey(hklm_key, set_access_key);
     DeleteRegistryKey(hklm_key, html_prog_id);
     DeleteRegistryValue(HKEY_LOCAL_MACHINE,
                         ShellUtil::kRegRegisteredApplications,
                         dist->GetApplicationName());
 
     // Delete the App Paths key that lets explorer find Chrome.
-    DeleteRegistryKey(hklm_key, installer_util::kAppPathsRegistryKey);
+    std::wstring app_path_key(ShellUtil::kAppPathsRegistryKey);
+    file_util::AppendToPath(&app_path_key, installer_util::kChromeExe);
+    DeleteRegistryKey(hklm_key, app_path_key);
 
     // Delete media player registry key that exists only in HKLM.
     std::wstring reg_path(installer::kMediaPlayerRegPath);
     file_util::AppendToPath(&reg_path, installer_util::kChromeExe);
     DeleteRegistryKey(hklm_key, reg_path);
     hklm_key.Close();
   }
 
   // Finally delete all the files from Chrome folder after moving setup.exe
   // to a temp location.
   if (!DeleteFilesAndFolders(exe_path, system_uninstall, installed_version))
     return installer_util::UNINSTALL_FAILED;
 
   if (!force_uninstall) {
     LOG(INFO) << "Uninstallation complete. Launching Uninstall survey.";
     dist->DoPostUninstallOperations(installed_version);
   }
   return installer_util::UNINSTALL_SUCCESSFUL;
 }