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

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

Issue 2760853002: Remove use of PRODUCT_STRING_PATH in chrome_elf. (Closed)
Patch Set: now Created 3 years, 9 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/browser/win/chrome_elf_init_unittest.cc ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index d0122073df81bbf1d6b48c7f95c5e99135427759..e8ef66919fc6f5e88cea62470735b8792a8eba72 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -574,20 +574,15 @@ void UninstallActiveSetupEntries(const InstallerState& installer_state,
// UninstallActiveSetupEntries so that it could service multiple tasks.
void RemoveBlacklistState() {
InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
- blacklist::kRegistryBeaconPath,
- 0); // wow64_access
-// The following key is no longer used (https://crbug.com/631771).
-// This cleanup is being left in for a time though.
-#if defined(GOOGLE_CHROME_BUILD)
- const wchar_t kRegistryFinchListPath[] =
- L"SOFTWARE\\Google\\Chrome\\BLFinchList";
-#else
- const wchar_t kRegistryFinchListPath[] =
- L"SOFTWARE\\Chromium\\BLFinchList";
-#endif
- InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
- kRegistryFinchListPath,
+ install_static::GetRegistryPath().append(
+ blacklist::kRegistryBeaconKeyName),
0); // wow64_access
+ // The following key is no longer used (https://crbug.com/631771). This
+ // cleanup is being left in for a time though.
+ InstallUtil::DeleteRegistryKey(
+ HKEY_CURRENT_USER,
+ install_static::GetRegistryPath().append(L"\\BLFinchList"),
+ 0); // wow64_access
}
// Removes the browser's persistent state in the Windows registry for the
« no previous file with comments | « chrome/browser/win/chrome_elf_init_unittest.cc ('k') | chrome_elf/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698