Revert 273108 "Omaha configuration parameters now use Wow6432Nod..."

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 79 matching lines @@
     const ProductState* product_state =
         original_state.GetProductState(system_level, dist_type);
     // Only modify other products if they're installed and multi.
     if (product_state != NULL &&
         product_state->is_multi_install() &&
         !product_state->channel().Equals(channel_info)) {
       BrowserDistribution* other_dist =
           BrowserDistribution::GetSpecificDistribution(dist_type);
       update_list->AddSetRegValueWorkItem(reg_root,
                                           other_dist->GetStateKey(),
-                                          KEY_WOW64_32KEY,
+                                          WorkItem::kWow64Default,
                                           google_update::kRegApField,
                                           channel_info.value(),
                                           true);
     } else {
       LOG_IF(ERROR,
              product_state != NULL && product_state->is_multi_install())
           << "Channel value for "
           << BrowserDistribution::GetSpecificDistribution(
                  dist_type)->GetDisplayName()
           << " is somehow already set to the desired new value of "
@@ skipping 1061 matching lines @@
 
   // Delete the registry keys (Uninstall key and Version key).
   HKEY reg_root = installer_state.root_key();
 
   // Note that we must retrieve the distribution-specific data before deleting
   // product.GetVersionKey().
   base::string16 distribution_data(browser_dist->GetDistributionData(reg_root));
 
   // Remove Control Panel uninstall link.
   if (product.ShouldCreateUninstallEntry()) {
-    InstallUtil::DeleteRegistryKey(
-        reg_root, browser_dist->GetUninstallRegPath(), KEY_WOW64_32KEY);
+    InstallUtil::DeleteRegistryKey(reg_root,
+                                   browser_dist->GetUninstallRegPath(),
+                                   WorkItem::kWow64Default);
   }
 
   // Remove Omaha product key.
-  InstallUtil::DeleteRegistryKey(
-      reg_root, browser_dist->GetVersionKey(), KEY_WOW64_32KEY);
+  InstallUtil::DeleteRegistryKey(reg_root, browser_dist->GetVersionKey(),
+                                 WorkItem::kWow64Default);
 
   // Also try to delete the MSI value in the ClientState key (it might not be
   // there). This is due to a Google Update behaviour where an uninstall and a
   // rapid reinstall might result in stale values from the old ClientState key
   // being picked up on reinstall.
   product.SetMsiMarker(installer_state.system_install(), false);
 
   InstallStatus ret = installer::UNKNOWN_STATUS;
 
   if (is_chrome) {
@@ skipping 74 matching lines @@
               chrome_launcher_support::INSTALLED_AT_USER_LEVEL;
       bool has_legacy_app_launcher = level_to_check ==
           chrome_launcher_support::GetAppLauncherInstallationState();
       if (!has_legacy_app_launcher) {
         BrowserDistribution* shadow_app_launcher_dist =
             BrowserDistribution::GetSpecificDistribution(
                 BrowserDistribution::CHROME_APP_HOST);
         InstallUtil::DeleteRegistryKey(
             reg_root,
             shadow_app_launcher_dist->GetVersionKey(),
-            KEY_WOW64_32KEY);
+            WorkItem::kWow64Default);
       }
     }
   }
 
   if (installer_state.is_multi_install())
     ProcessGoogleUpdateItems(original_state, installer_state, product);
 
   // Get the state of the installed product (if any)
   const ProductState* product_state =
       original_state.GetProductState(installer_state.system_install(),
@@ skipping 163 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