Index: chrome_elf/chrome_elf_constants.cc |
diff --git a/chrome_elf/chrome_elf_constants.cc b/chrome_elf/chrome_elf_constants.cc |
index 7115aaf4d14b26708978ff5c90e86da00d14af1b..fec3d170677eae61d5a807b00f0840d3347b10f9 100644 |
--- a/chrome_elf/chrome_elf_constants.cc |
+++ b/chrome_elf/chrome_elf_constants.cc |
@@ -4,21 +4,9 @@ |
#include "chrome_elf/chrome_elf_constants.h" |
-#if defined(GOOGLE_CHROME_BUILD) |
-// Using PRODUCT_STRING_PATH will make Google Chrome and Canary configurations |
-// collide. This was deemed to be the best option due to ELF's inability to |
-// depend on BrowserDistribution. http://crbug.com/577820 |
-#define PRODUCT_STRING_PATH L"Google\\Chrome" |
-#elif defined(CHROMIUM_BUILD) |
-#define PRODUCT_STRING_PATH L"Chromium" |
-#else |
-#error Unknown branding |
-#endif |
- |
namespace blacklist { |
-const wchar_t kRegistryBeaconPath[] = |
- L"SOFTWARE\\" PRODUCT_STRING_PATH L"\\BLBeacon"; |
+const wchar_t kRegistryBeaconKeyName[] = L"\\BLBeacon"; |
const wchar_t kBeaconVersion[] = L"version"; |
const wchar_t kBeaconState[] = L"state"; |
const wchar_t kBeaconAttemptCount[] = L"failed_count"; |
@@ -29,9 +17,6 @@ const DWORD kBeaconMaxAttempts = 2; |
namespace elf_sec { |
-const wchar_t kRegSecurityFinchPath[] = |
- L"SOFTWARE\\" PRODUCT_STRING_PATH L"\\BrowserSboxFinch"; |
-const wchar_t kRegSecurityPath[] = |
- L"SOFTWARE\\" PRODUCT_STRING_PATH L"\\BrowserSec"; |
+const wchar_t kRegSecurityFinchKeyName[] = L"\\BrowserSboxFinch"; |
} // namespace elf_sec |