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

Side by Side Diff: chrome/installer/util/delete_reg_value_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: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <windows.h> 5 #include <windows.h>
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_str.c_str(), data_str.c_str())); 55 ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_str.c_str(), data_str.c_str()));
56 std::wstring name_dword(kNameDword); 56 std::wstring name_dword(kNameDword);
57 DWORD data_dword = 100; 57 DWORD data_dword = 100;
58 ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_dword.c_str(), data_dword)); 58 ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name_dword.c_str(), data_dword));
59 59
60 std::wstring name_empty(L"name_empty"); 60 std::wstring name_empty(L"name_empty");
61 ASSERT_EQ(ERROR_SUCCESS, RegSetValueEx(key.Handle(), name_empty.c_str(), NULL, 61 ASSERT_EQ(ERROR_SUCCESS, RegSetValueEx(key.Handle(), name_empty.c_str(), NULL,
62 REG_SZ, NULL, 0)); 62 REG_SZ, NULL, 0));
63 63
64 scoped_ptr<DeleteRegValueWorkItem> work_item1( 64 scoped_ptr<DeleteRegValueWorkItem> work_item1(
65 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 65 WorkItem::CreateDeleteRegValueWorkItem(
66 name_str)); 66 HKEY_CURRENT_USER, parent_key, WorkItem::kWow64Default, name_str));
67 scoped_ptr<DeleteRegValueWorkItem> work_item2( 67 scoped_ptr<DeleteRegValueWorkItem> work_item2(
68 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 68 WorkItem::CreateDeleteRegValueWorkItem(
69 name_dword)); 69 HKEY_CURRENT_USER, parent_key, WorkItem::kWow64Default, name_dword));
70 scoped_ptr<DeleteRegValueWorkItem> work_item3( 70 scoped_ptr<DeleteRegValueWorkItem> work_item3(
71 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 71 WorkItem::CreateDeleteRegValueWorkItem(
72 name_empty)); 72 HKEY_CURRENT_USER, parent_key, WorkItem::kWow64Default, name_empty));
73 73
74 EXPECT_TRUE(work_item1->Do()); 74 EXPECT_TRUE(work_item1->Do());
75 EXPECT_TRUE(work_item2->Do()); 75 EXPECT_TRUE(work_item2->Do());
76 EXPECT_TRUE(work_item3->Do()); 76 EXPECT_TRUE(work_item3->Do());
77 77
78 EXPECT_FALSE(key.HasValue(name_str.c_str())); 78 EXPECT_FALSE(key.HasValue(name_str.c_str()));
79 EXPECT_FALSE(key.HasValue(name_dword.c_str())); 79 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
80 EXPECT_FALSE(key.HasValue(name_empty.c_str())); 80 EXPECT_FALSE(key.HasValue(name_empty.c_str()));
81 81
82 work_item1->Rollback(); 82 work_item1->Rollback();
(...skipping 23 matching lines...) Expand all
106 parent_key.push_back(base::FilePath::kSeparators[0]); 106 parent_key.push_back(base::FilePath::kSeparators[0]);
107 parent_key.append(kWriteNew); 107 parent_key.append(kWriteNew);
108 ASSERT_EQ(ERROR_SUCCESS, 108 ASSERT_EQ(ERROR_SUCCESS,
109 key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE)); 109 key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE));
110 std::wstring name_str(kNameStr); 110 std::wstring name_str(kNameStr);
111 std::wstring name_dword(kNameDword); 111 std::wstring name_dword(kNameDword);
112 EXPECT_FALSE(key.HasValue(name_str.c_str())); 112 EXPECT_FALSE(key.HasValue(name_str.c_str()));
113 EXPECT_FALSE(key.HasValue(name_dword.c_str())); 113 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
114 114
115 scoped_ptr<DeleteRegValueWorkItem> work_item1( 115 scoped_ptr<DeleteRegValueWorkItem> work_item1(
116 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 116 WorkItem::CreateDeleteRegValueWorkItem(
117 name_str)); 117 HKEY_CURRENT_USER, parent_key, WorkItem::kWow64Default, name_str));
118 scoped_ptr<DeleteRegValueWorkItem> work_item2( 118 scoped_ptr<DeleteRegValueWorkItem> work_item2(
119 WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key, 119 WorkItem::CreateDeleteRegValueWorkItem(
120 name_dword)); 120 HKEY_CURRENT_USER, parent_key, WorkItem::kWow64Default, name_dword));
121 121
122 EXPECT_TRUE(work_item1->Do()); 122 EXPECT_TRUE(work_item1->Do());
123 EXPECT_TRUE(work_item2->Do()); 123 EXPECT_TRUE(work_item2->Do());
124 124
125 EXPECT_FALSE(key.HasValue(name_str.c_str())); 125 EXPECT_FALSE(key.HasValue(name_str.c_str()));
126 EXPECT_FALSE(key.HasValue(name_dword.c_str())); 126 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
127 127
128 work_item1->Rollback(); 128 work_item1->Rollback();
129 work_item2->Rollback(); 129 work_item2->Rollback();
130 130
131 EXPECT_FALSE(key.HasValue(name_str.c_str())); 131 EXPECT_FALSE(key.HasValue(name_str.c_str()));
132 EXPECT_FALSE(key.HasValue(name_dword.c_str())); 132 EXPECT_FALSE(key.HasValue(name_dword.c_str()));
133 } 133 }
OLDNEW
« no previous file with comments | « chrome/installer/util/delete_reg_value_work_item.cc ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698