More verbose logging on Active Setup uninstall steps.

BUG=518014

Review URL: https://codereview.chromium.org/1281063002

Cr-Commit-Position: refs/heads/master@{#343183}

1 files changed, 12 insertions, 2 deletions

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 4049a46..0404b79 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -710,7 +710,7 @@ bool ProcessDelegateExecuteWorkItems(const InstallerState& installer_state,
 // a no-op for all other types of installs.
 void UninstallActiveSetupEntries(const InstallerState& installer_state,
                                  const Product& product) {
-  VLOG(1) << "Uninstalling registry entries for ActiveSetup.";
+  VLOG(1) << "Uninstalling registry entries for Active Setup.";
   BrowserDistribution* distribution = product.distribution();
 
   if (!product.is_chrome() || !installer_state.system_install()) {
@@ -743,6 +743,8 @@ void UninstallActiveSetupEntries(const InstallerState& installer_state,
   // all users hives. If a given user's hive is not loaded, try to load it to
   // proceed with the deletion (failure to do so is ignored).
 
+  VLOG(1) << "Uninstall per-user Active Setup keys.";
+
   static const wchar_t kProfileList[] =
       L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\";
 
@@ -769,12 +771,16 @@ void UninstallActiveSetupEntries(const InstallerState& installer_state,
        it.Valid(); ++it) {
     const wchar_t* profile_sid = it.Name();
 
+    VLOG(1) << "Uninstalling Active Setup key for " << profile_sid;
+
     // First check if this user's registry hive needs to be loaded in
     // HKEY_USERS.
     base::win::RegKey user_reg_root_probe(
         HKEY_USERS, profile_sid, KEY_READ);
     bool loaded_hive = false;
-    if (!user_reg_root_probe.Valid()) {
+    if (user_reg_root_probe.Valid()) {
+      VLOG(1) << "Registry hive already loaded for " << profile_sid;
+    } else {
       VLOG(1) << "Attempting to load registry hive for " << profile_sid;
 
       base::string16 reg_profile_info_path(kProfileList);
@@ -815,6 +821,10 @@ void UninstallActiveSetupEntries(const InstallerState& installer_state,
                    << ", result: " << result;
       }
     }
+    VLOG_IF(1, result == ERROR_SUCCESS)
+        << "Deleted Active Setup entry for " << profile_sid;
+    VLOG_IF(1, result == ERROR_FILE_NOT_FOUND)
+        << "No Active Setup entry to delete for " << profile_sid;
 
     if (loaded_hive) {
       user_reg_root.Close();