Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7275)

Unified Diff: chrome/installer/setup/install_worker_unittest.cc

Issue 282363003: Add WOW64 support to the installer registry work items (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: nits. fix call to DeleteRegistryKey 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
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker_unittest.cc
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index 9d2a2663b5a08cdf037f1867d91272effd325945..059752179a3a8391ebc468c4e9df54aa3f5cb186 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -438,10 +438,11 @@ TEST_F(InstallWorkerTest, TestInstallChromeSingleSystem) {
const HKEY kRegRoot = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
static const wchar_t kRegKeyPath[] = L"Software\\Chromium\\test";
scoped_ptr<CreateRegKeyWorkItem> create_reg_key_work_item(
- WorkItem::CreateCreateRegKeyWorkItem(kRegRoot, kRegKeyPath));
+ WorkItem::CreateCreateRegKeyWorkItem(
+ kRegRoot, kRegKeyPath, WorkItem::kWow64Default));
scoped_ptr<SetRegValueWorkItem> set_reg_value_work_item(
- WorkItem::CreateSetRegValueWorkItem(kRegRoot, kRegKeyPath, L"", L"",
- false));
+ WorkItem::CreateSetRegValueWorkItem(
+ kRegRoot, kRegKeyPath, WorkItem::kWow64Default, L"", L"", false));
scoped_ptr<InstallationState> installation_state(
BuildChromeInstallationState(system_level, multi_install));
@@ -683,8 +684,8 @@ class QuickEnableAbsentTest : public InstallWorkerTest {
virtual void SetUp() {
InstallWorkerTest::SetUp();
root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
- delete_reg_key_item_.reset(
- WorkItem::CreateDeleteRegKeyWorkItem(root_key_, kRegKeyPath));
+ delete_reg_key_item_.reset(WorkItem::CreateDeleteRegKeyWorkItem(
+ root_key_, kRegKeyPath, WorkItem::kWow64Default));
machine_state_.reset(new MockInstallationState());
EXPECT_CALL(work_item_list_,
AddDeleteRegKeyWorkItem(Eq(root_key_), StrCaseEq(kRegKeyPath)))
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698