chrome/installer/util/delete_reg_key_work_item_unittest.cc - Issue 282363003: Add WOW64 support to the installer registry work items

Unified Diff: chrome/installer/util/delete_reg_key_work_item_unittest.cc

Issue 282363003: Add WOW64 support to the installer registry work items (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: code review changes. found a few APIs that needed the WOW64 flag. Fix ordering of some parameters. Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/installer/util/delete_reg_key_work_item.cc ('K') | « chrome/installer/util/delete_reg_key_work_item.cc ('k') | chrome/installer/util/delete_reg_value_work_item.h » ('j') | chrome/installer/util/install_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/installer/util/delete_reg_key_work_item_unittest.cc

diff --git a/chrome/installer/util/delete_reg_key_work_item_unittest.cc b/chrome/installer/util/delete_reg_key_work_item_unittest.cc

index 2127e3db59ce54b6d50bee56297c13a099785a3e..5e8c43529e0bdc9c6ef423dd0682dce9b6eba59b 100644

--- a/chrome/installer/util/delete_reg_key_work_item_unittest.cc

+++ b/chrome/installer/util/delete_reg_key_work_item_unittest.cc

@@ -37,8 +37,8 @@ TEST_F(DeleteRegKeyWorkItemTest, TestNoKey) {

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));

@@ -53,8 +53,8 @@ TEST_F(DeleteRegKeyWorkItemTest, TestNoKey) {

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));

@@ -69,8 +69,8 @@ TEST_F(DeleteRegKeyWorkItemTest, TestEmptyKey) {

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));

@@ -112,8 +112,8 @@ TEST_F(DeleteRegKeyWorkItemTest, DISABLED_TestUndeletableKey) {

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));