summaryrefslogtreecommitdiffstats
path: root/chrome_elf/blacklist/test
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 21:01:38 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 21:01:38 +0000
commitf863ef3f45069cbba9797bb10472c910bf928569 (patch)
treeb92f70bc4959fc796902834e9bb4efa1802d1713 /chrome_elf/blacklist/test
parent88c8cb264719a9ae817803b0260fc07a6acb03c7 (diff)
downloadchromium_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/blacklist/test')
-rw-r--r--chrome_elf/blacklist/test/blacklist_test.cc11
1 files changed, 0 insertions, 11 deletions
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) {