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

chrome/installer/gcapi/gcapi_reactivation_test.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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
@@ skipping 13 matching lines @@
  protected:
   GCAPIReactivationTest() {}
 
   bool SetChromeInstallMarker(HKEY hive) {
     // Create the client state keys in the right places.
     std::wstring reg_path(google_update::kRegPathClients);
     reg_path += L"\\";
     reg_path += google_update::kChromeUpgradeCode;
     RegKey client_state(hive,
                         reg_path.c_str(),
-                        KEY_CREATE_SUB_KEY | KEY_SET_VALUE | KEY_WOW64_32KEY);
+                        KEY_CREATE_SUB_KEY | KEY_SET_VALUE);
     return (client_state.Valid() &&
             client_state.WriteValue(
                 google_update::kRegVersionField, L"1.2.3.4") == ERROR_SUCCESS);
   }
 
   bool SetLastRunTime(HKEY hive, int64 last_run_time) {
     return SetLastRunTimeString(hive, base::Int64ToString16(last_run_time));
   }
 
   bool SetLastRunTimeString(HKEY hive,
                             const base::string16& last_run_time_string) {
     const wchar_t* base_path =
         (hive == HKEY_LOCAL_MACHINE) ?
             google_update::kRegPathClientStateMedium :
             google_update::kRegPathClientState;
     std::wstring path(base_path);
     path += L"\\";
     path += google_update::kChromeUpgradeCode;
 
-    RegKey client_state(hive, path.c_str(), KEY_SET_VALUE | KEY_WOW64_32KEY);
+    RegKey client_state(hive, path.c_str(), KEY_SET_VALUE);
     return (client_state.Valid() &&
             client_state.WriteValue(
                 google_update::kRegLastRunTimeField,
                 last_run_time_string.c_str()) == ERROR_SUCCESS);
   }
 
   bool HasExperimentLabels(HKEY hive) {
     base::string16 client_state_path(google_update::kRegPathClientState);
     client_state_path.push_back(L'\\');
     client_state_path.append(google_update::kChromeUpgradeCode);
 
     RegKey client_state_key(hive,
                             client_state_path.c_str(),
-                            KEY_QUERY_VALUE | KEY_WOW64_32KEY);
+                            KEY_QUERY_VALUE);
     return client_state_key.Valid() &&
         client_state_key.HasValue(google_update::kExperimentLabels);
   }
 
   std::wstring GetReactivationString(HKEY hive) {
     const wchar_t* base_path =
         (hive == HKEY_LOCAL_MACHINE) ?
             google_update::kRegPathClientStateMedium :
             google_update::kRegPathClientState;
     std::wstring path(base_path);
     path += L"\\";
     path += google_update::kChromeUpgradeCode;
 
-    RegKey client_state(hive, path.c_str(), KEY_QUERY_VALUE | KEY_WOW64_32KEY);
+    RegKey client_state(hive, path.c_str(), KEY_QUERY_VALUE);
     if (client_state.Valid()) {
       std::wstring actual_brand;
       if (client_state.ReadValue(google_update::kRegRLZReactivationBrandField,
                                  &actual_brand) == ERROR_SUCCESS) {
         return actual_brand;
       }
     }
 
     return L"ERROR";
   }
@@ skipping 108 matching lines @@
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA",
                                GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasExperimentLabels(HKEY_CURRENT_USER));
 }