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

Unified Diff: chrome/test/mini_installer_test/installer_test_util.cc

Issue 282363003: Add WOW64 support to the installer registry work items (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: typo: & should be | 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/test/mini_installer_test/installer_test_util.h ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/installer_test_util.cc
diff --git a/chrome/test/mini_installer_test/installer_test_util.cc b/chrome/test/mini_installer_test/installer_test_util.cc
index 76d1f97571eccc3eb6044326f91f99ce91e1e452..e9c6a8c7a88fe88c1b4b53ccba85b7b068a2d0bc 100644
--- a/chrome/test/mini_installer_test/installer_test_util.cc
+++ b/chrome/test/mini_installer_test/installer_test_util.cc
@@ -65,14 +65,16 @@ bool DeleteInstallDirectory(bool system_level,
}
bool DeleteRegistryKey(bool system_level,
- InstallationValidator::InstallationType type) {
+ InstallationValidator::InstallationType type,
+ REGSAM wow64_access) {
BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
ToBrowserDistributionType(type));
base::FilePath::StringType key(google_update::kRegPathClients);
key.push_back(base::FilePath::kSeparators[0]);
key.append(dist->GetAppGuid());
HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
- return InstallUtil::DeleteRegistryKey(root, key);
+ LONG result = InstallUtil::DeleteRegistryKey(root, key, wow64_access);
grt (UTC plus 2) 2014/05/23 01:28:51 this returns bool now, so just return InstallUtil:
Will Harris 2014/05/23 03:19:22 Good spot, not sure how I missed that one.
+ return (result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
}
bool GetChromeInstallDirectory(bool system_level, base::FilePath* path) {
@@ -296,4 +298,4 @@ bool RunAndWaitForCommandToFinish(CommandLine command) {
return true;
}
-} // namespace
+} // namespace installer_test
« no previous file with comments | « chrome/test/mini_installer_test/installer_test_util.h ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698