Add WOW64 support to the installer registry work items

chrome/installer/util/install_util.h

 // 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 declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_
@@ skipping 95 matching lines @@
   // by either --chrome-sxs or the executable path).
   static bool IsChromeSxSProcess();
 
   // Returns true if the sentinel file exists (or the path cannot be obtained).
   static bool IsFirstRunSentinelPresent();
 
   // Populates |path| with EULA sentinel file path. Returns false on error.
   static bool GetEULASentinelFilePath(base::FilePath* path);
 
   // Deletes the registry key at path key_path under the key given by root_key.
-  static bool DeleteRegistryKey(HKEY root_key, const base::string16& key_path);
+  static bool DeleteRegistryKey(HKEY root_key,
+                                const base::string16& key_path,
+                                REGSAM wow64_access);
 
   // Deletes the registry value named value_name at path key_path under the key
   // given by reg_root.
   static bool DeleteRegistryValue(HKEY reg_root, const base::string16& key_path,
+                                  REGSAM wow64_access,

[grt (UTC plus 2), 2014/05/22 22:17:23]

nice catch!

                                   const base::string16& value_name);
 
   // An interface to a predicate function for use by DeleteRegistryKeyIf and
   // DeleteRegistryValueIf.
   class RegistryValuePredicate {
    public:
     virtual ~RegistryValuePredicate() { }
     virtual bool Evaluate(const base::string16& value) const = 0;
   };
 
   // The result of a conditional delete operation (i.e., DeleteFOOIf).
   enum ConditionalDeleteResult {
     NOT_FOUND,      // The condition was not satisfied.
     DELETED,        // The condition was satisfied and the delete succeeded.
     DELETE_FAILED   // The condition was satisfied but the delete failed.
   };
 
   // Deletes the key |key_to_delete_path| under |root_key| iff the value
   // |value_name| in the key |key_to_test_path| under |root_key| satisfies
   // |predicate|.  |value_name| may be either NULL or an empty string to test
   // the key's default value.
   static ConditionalDeleteResult DeleteRegistryKeyIf(
       HKEY root_key,
       const base::string16& key_to_delete_path,
       const base::string16& key_to_test_path,
+      REGSAM wow64_access,
       const wchar_t* value_name,
       const RegistryValuePredicate& predicate);
 
   // Deletes the value |value_name| in the key |key_path| under |root_key| iff
   // its current value satisfies |predicate|.  |value_name| may be either NULL
   // or an empty string to test/delete the key's default value.
   static ConditionalDeleteResult DeleteRegistryValueIf(
       HKEY root_key,
       const wchar_t* key_path,
+      REGSAM wow64_access,
       const wchar_t* value_name,
       const RegistryValuePredicate& predicate);
 
   // A predicate that performs a case-sensitive string comparison.
   class ValueEquals : public RegistryValuePredicate {
    public:
     explicit ValueEquals(const base::string16& value_to_match)
         : value_to_match_(value_to_match) { }
     virtual bool Evaluate(const base::string16& value) const OVERRIDE;
    protected:
@@ skipping 36 matching lines @@
    private:
     DISALLOW_COPY_AND_ASSIGN(ProgramCompare);
   };  // class ProgramCompare
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_