Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit

chrome/installer/util/installation_state.cc

Index: chrome/installer/util/installation_state.cc
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
index 91631b147375e6e9e8d51635141ef8fc183257b8..8289c26b870922a2cc52ced3cd9827073213181f 100644
--- a/chrome/installer/util/installation_state.cc
+++ b/chrome/installer/util/installation_state.cc
@@ -40,7 +40,7 @@ bool ProductState::InitializeCommands(const base::win::RegKey& version_key,
   base::win::RegKey commands_key;
 
   if (commands_key.Open(version_key.Handle(), google_update::kRegCommandsKey,
-                        kAccess) == ERROR_SUCCESS)
+                        kAccess | KEY_WOW64_32KEY) == ERROR_SUCCESS)

[grt (UTC plus 2), 2014/05/27 16:42:08]

move to definition of kAccess

[Will Harris, 2014/05/27 19:25:10]

Done.

     return commands->Initialize(commands_key);
   return false;
 }
@@ -57,7 +57,7 @@ bool ProductState::Initialize(bool system_install,
 
   // Read from the Clients key.
   if (key.Open(root_key, version_key.c_str(),
-               KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+               KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS) {

[grt (UTC plus 2), 2014/05/27 16:42:08]

define a local kAccess const with these two bits and use it in their place
throughout the function

[Will Harris, 2014/05/27 19:25:10]

Done.

     base::string16 version_str;
     if (key.ReadValue(google_update::kRegVersionField,
                       &version_str) == ERROR_SUCCESS) {
@@ -83,7 +83,7 @@ bool ProductState::Initialize(bool system_install,
 
   // Read from the ClientState key.
   if (key.Open(root_key, state_key.c_str(),
-               KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+               KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS) {
     std::wstring setup_path;
     std::wstring uninstall_arguments;
     // "ap" will be absent if not managed by Google Update.
@@ -125,7 +125,7 @@ bool ProductState::Initialize(bool system_install,
   // ClientState.
   if (system_install &&
       key.Open(root_key, distribution->GetStateMediumKey().c_str(),
-               KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+               KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS) {
     DWORD dword_value = 0;
 
     if (key.ReadValueDW(google_update::kRegUsageStatsField,