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