Add WOW64 support to the installer registry work items

chrome/installer/util/delete_reg_key_work_item_unittest.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <atlsecurity.h>  // NOLINT
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/delete_reg_key_work_item.h"
@@ skipping 19 matching lines @@
 // Test that deleting a key that doesn't exist succeeds, and that rollback does
 // nothing.
 TEST_F(DeleteRegKeyWorkItemTest, TestNoKey) {
   const std::wstring key_paths[] = {
     std::wstring(test_data_.base_path() + L"\\NoKeyHere"),
     std::wstring(test_data_.base_path() + L"\\NoKeyHere\\OrHere")
   };
   RegKey key;
   for (size_t i = 0; i < arraysize(key_paths); ++i) {
     const std::wstring& key_path = key_paths[i];
-    scoped_ptr<DeleteRegKeyWorkItem> item(
-        WorkItem::CreateDeleteRegKeyWorkItem(test_data_.root_key(), key_path));
+    scoped_ptr<DeleteRegKeyWorkItem> item(WorkItem::CreateDeleteRegKeyWorkItem(
+        test_data_.root_key(), key_path, WorkItem::kWow64Default));
     EXPECT_TRUE(item->Do());
     EXPECT_NE(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_path.c_str(),
                                       KEY_READ));
     item->Rollback();
     item.reset();
     EXPECT_NE(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_path.c_str(),
                                       KEY_READ));
   }
 }
 
 // Test that deleting an empty key succeeds, and that rollback brings it back.
 TEST_F(DeleteRegKeyWorkItemTest, TestEmptyKey) {
   RegKey key;
   const std::wstring& key_path = test_data_.empty_key_path();
-  scoped_ptr<DeleteRegKeyWorkItem> item(
-      WorkItem::CreateDeleteRegKeyWorkItem(test_data_.root_key(), key_path));
+  scoped_ptr<DeleteRegKeyWorkItem> item(WorkItem::CreateDeleteRegKeyWorkItem(
+      test_data_.root_key(), key_path, WorkItem::kWow64Default));
   EXPECT_TRUE(item->Do());
   EXPECT_NE(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_path.c_str(),
                                     KEY_READ));
   item->Rollback();
   item.reset();
   EXPECT_EQ(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_path.c_str(),
                                     KEY_READ));
 }
 
 // Test that deleting a key with subkeys and values succeeds, and that rollback
 // brings them all back.
 TEST_F(DeleteRegKeyWorkItemTest, TestNonEmptyKey) {
   RegKey key;
   const std::wstring& key_path = test_data_.non_empty_key_path();
-  scoped_ptr<DeleteRegKeyWorkItem> item(
-      WorkItem::CreateDeleteRegKeyWorkItem(test_data_.root_key(), key_path));
+  scoped_ptr<DeleteRegKeyWorkItem> item(WorkItem::CreateDeleteRegKeyWorkItem(
+      test_data_.root_key(), key_path, WorkItem::kWow64Default));
   EXPECT_TRUE(item->Do());
   EXPECT_NE(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_path.c_str(),
                                     KEY_READ));
   item->Rollback();
   item.reset();
   test_data_.ExpectMatchesNonEmptyKey(test_data_.root_key(), key_path.c_str());
 }
 
 // Test that deleting a key with subkeys we can't delete fails, and that
 // everything is there after rollback.
@@ skipping 21 matching lines @@
                               const_cast<SECURITY_DESCRIPTOR*>(
                                   sec_desc.GetPSECURITY_DESCRIPTOR())));
   sec_desc.FromString(L"D:PAI(A;OICI;KA;;;BU)");  // builtin users all access
   EXPECT_EQ(ERROR_SUCCESS,
             RegSetKeySecurity(subkey2.Handle(), DACL_SECURITY_INFORMATION,
                               const_cast<SECURITY_DESCRIPTOR*>(
                                   sec_desc.GetPSECURITY_DESCRIPTOR())));
   subkey2.Close();
   subkey.Close();
   key.Close();
-  scoped_ptr<DeleteRegKeyWorkItem> item(
-      WorkItem::CreateDeleteRegKeyWorkItem(test_data_.root_key(), key_name));
+  scoped_ptr<DeleteRegKeyWorkItem> item(WorkItem::CreateDeleteRegKeyWorkItem(
+      test_data_.root_key(), key_name, WorkItem::kWow64Default));
   EXPECT_FALSE(item->Do());
   EXPECT_EQ(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_name.c_str(),
                                     KEY_QUERY_VALUE));
   item->Rollback();
   item.reset();
   EXPECT_EQ(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_name.c_str(),
                                     KEY_QUERY_VALUE));
   std::wstring str_value;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(NULL, &str_value));
   EXPECT_EQ(key_name, str_value);
   EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey", KEY_READ | WRITE_DAC));
   dw_value = 0;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"SomeValue", &dw_value));
   EXPECT_EQ(1U, dw_value);
   // Give users all access to the subkey so it can be deleted.
   EXPECT_EQ(ERROR_SUCCESS,
       RegSetKeySecurity(key.Handle(), DACL_SECURITY_INFORMATION,
                         const_cast<SECURITY_DESCRIPTOR*>(
                             sec_desc.GetPSECURITY_DESCRIPTOR())));
   EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey2", KEY_QUERY_VALUE));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"", &dw_value));
   EXPECT_EQ(2U, dw_value);
 }