Delete Chrome state in registry on uninstall when the user profile is being deleted.

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 <windows.h>
 
@@ skipping 819 matching lines @@
       user_reg_root.Close();
       if (RegUnLoadKey(HKEY_USERS, profile_sid) == ERROR_SUCCESS)
         VLOG(1) << "Unloaded registry hive for " << profile_sid;
       else
         LOG(ERROR) << "Error unloading registry hive for " << profile_sid;
     }
   }
 }
 
 // Removes the persistent blacklist state for the current user.  Note: this will
-// not remove the state for users other than the one uninstalling chrome on a
+// not remove the state for users other than the one uninstalling Chrome on a
 // system-level install (http://crbug.com/388725). Doing so would require
 // extracting the per-user registry hive iteration from
 // UninstallActiveSetupEntries so that it could service multiple tasks.
 void RemoveBlacklistState() {
   InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
                                  blacklist::kRegistryBeaconPath,
                                  0);  // wow64_access
   InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
                                  blacklist::kRegistryFinchListPath,
                                  0);  // wow64_access
 }
 
+// Removes the persistent state for |distribution| for the current user. Note:
+// this will not remove the state for users other than the one uninstalling
+// Chrome on a system-level install; see RemoveBlacklistState for details.
+void RemoveDistributionRegistryState(BrowserDistribution* distribution) {
+  static const base::char16* const kKeysToPreserve[] = {
+      L"Extensions",
+      L"NativeMessagingHosts",
+  };
+  base::string16 key_name(L"Software\\");
+  key_name += distribution->GetInstallSubDir();
+  // Delete the contents of the distribution key except for those parts used by
+  // outsiders to configure Chrome.
+  DeleteRegistryKeyPartial(
+      HKEY_CURRENT_USER, key_name,
+      std::vector<base::string16>(
+          &kKeysToPreserve[0],
+          &kKeysToPreserve[arraysize(kKeysToPreserve) - 1]));
+}
+
 }  // namespace
 
 DeleteResult DeleteChromeDirectoriesIfEmpty(
     const base::FilePath& application_directory) {
   DeleteResult result(DeleteEmptyDir(application_directory));
   if (result == DELETE_SUCCEEDED) {
     // Now check and delete if the parent directories are empty
     // For example Google\Chrome or Chromium
     const base::FilePath product_directory(application_directory.DirName());
     if (!product_directory.empty()) {
@@ skipping 469 matching lines @@
   if (!installer_state.is_multi_install() || product.is_chrome_binaries()) {
     DeleteResult delete_result = DeleteChromeFilesAndFolders(
         installer_state, base::MakeAbsoluteFilePath(setup_exe));
     if (delete_result == DELETE_FAILED) {
       ret = installer::UNINSTALL_FAILED;
     } else if (delete_result == DELETE_REQUIRES_REBOOT) {
       ret = installer::UNINSTALL_REQUIRES_REBOOT;
     }
   }
 
-  if (delete_profile)
+  if (delete_profile) {
     DeleteUserDataDir(user_data_dir, product.is_chrome_frame());
+    RemoveDistributionRegistryState(browser_dist);
+  }
 
   if (!force_uninstall) {
     VLOG(1) << "Uninstallation complete. Launching post-uninstall operations.";
     browser_dist->DoPostUninstallOperations(product_state->version(),
         backup_state_file, distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
@@ skipping 65 matching lines @@
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
     *uninstall_status = UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer