diff options
author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:01:38 +0000 |
---|---|---|
committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:01:38 +0000 |
commit | f863ef3f45069cbba9797bb10472c910bf928569 (patch) | |
tree | b92f70bc4959fc796902834e9bb4efa1802d1713 /chrome_elf | |
parent | 88c8cb264719a9ae817803b0260fc07a6acb03c7 (diff) | |
download | chromium_src-f863ef3f45069cbba9797bb10472c910bf928569.zip chromium_src-f863ef3f45069cbba9797bb10472c910bf928569.tar.gz chromium_src-f863ef3f45069cbba9797bb10472c910bf928569.tar.bz2 |
Remove Version Check when Determining if Blacklist is Enabled
If the registry says the blacklist is enabled, then enable it, even if
it was enabled for a different version of Chrome.
BUG=329023
Review URL: https://codereview.chromium.org/178543011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
-rw-r--r-- | chrome_elf/blacklist.gypi | 1 | ||||
-rw-r--r-- | chrome_elf/blacklist/blacklist.cc | 18 | ||||
-rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 11 |
3 files changed, 0 insertions, 30 deletions
diff --git a/chrome_elf/blacklist.gypi b/chrome_elf/blacklist.gypi index 86c97c9..7ab5be1 100644 --- a/chrome_elf/blacklist.gypi +++ b/chrome_elf/blacklist.gypi @@ -21,7 +21,6 @@ # as that would risk pulling in base's link-time dependencies which # chrome_elf cannot do. '../base/base.gyp:base_static', - '../chrome/chrome.gyp:chrome_version_header', '../chrome_elf/chrome_elf.gyp:chrome_elf_breakpad', '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', '../sandbox/sandbox.gyp:sandbox', diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc index 681427a..23a06b4 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; diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index e507446..05aeb14 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -82,17 +82,6 @@ TEST_F(BlacklistTest, Beacon) { // Resetting the beacon should work when setup beacon is present. EXPECT_TRUE(blacklist::ResetBeacon()); - - // Change the version and ensure that the setup fails due to the version - // mismatch. - base::string16 different_version(L"other_version"); - ASSERT_NE(different_version, TEXT(CHROME_VERSION_STRING)); - - result = blacklist_registry_key.WriteValue(blacklist::kBeaconVersion, - different_version.c_str()); - EXPECT_EQ(ERROR_SUCCESS, result); - - EXPECT_FALSE(blacklist::LeaveSetupBeacon()); } TEST_F(BlacklistTest, AddAndRemoveModules) { |