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

Unified Diff: chrome_elf/blacklist/blacklist.cc

Issue 178543011: Remove Version Check when Determining if Blacklist is Enabled (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 10 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_elf/blacklist.gypi ('k') | chrome_elf/blacklist/test/blacklist_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_elf/blacklist/blacklist.cc
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 681427aa076c52ac7764ff09caaebd98b1b5162c..23a06b4d341d587eccd8989fc76d1c5917eb11b5 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -15,7 +15,6 @@
#include "sandbox/win/src/internal_types.h"
#include "sandbox/win/src/sandbox_utils.h"
#include "sandbox/win/src/service_resolver.h"
-#include "version.h" // NOLINT
// http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -205,23 +204,6 @@ bool LeaveSetupBeacon() {
return false;
}
- // If the blacklist wasn't set as enabled for this version, don't
- // use it.
- wchar_t key_data[255] = {};
- DWORD key_data_size = sizeof(key_data);
- result = ::RegQueryValueEx(key,
- blacklist::kBeaconVersion,
- 0,
- &type,
- reinterpret_cast<LPBYTE>(key_data),
- &key_data_size);
-
- if (wcscmp(key_data, TEXT(CHROME_VERSION_STRING)) != 0 ||
- result != ERROR_SUCCESS || type != REG_SZ) {
- ::RegCloseKey(key);
- return false;
- }
-
// Mark the blacklist setup code as running so if it crashes the blacklist
// won't be enabled for the next run.
blacklist_state = BLACKLIST_SETUP_RUNNING;
« no previous file with comments | « chrome_elf/blacklist.gypi ('k') | chrome_elf/blacklist/test/blacklist_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698