summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_elf_init_win.cc
diff options
context:
space:
mode:
authorkrstnmnlsn@chromium.org <krstnmnlsn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-17 17:35:20 +0000
committerkrstnmnlsn@chromium.org <krstnmnlsn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-17 17:35:20 +0000
commit22384bd37ad9d6e3e6c8a41639e249a20f4f2c00 (patch)
tree4311eb928aff96fc04e596d9dc4667746140da5c /chrome/browser/chrome_elf_init_win.cc
parent4183bf094ad740b5a310d45b4a05332d26f6e218 (diff)
downloadchromium_src-22384bd37ad9d6e3e6c8a41639e249a20f4f2c00.zip
chromium_src-22384bd37ad9d6e3e6c8a41639e249a20f4f2c00.tar.gz
chromium_src-22384bd37ad9d6e3e6c8a41639e249a20f4f2c00.tar.bz2
Changed the default Blacklist case (for no finch)
from disabled to enabled. BUG= Review URL: https://codereview.chromium.org/272213006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_elf_init_win.cc')
-rw-r--r--chrome/browser/chrome_elf_init_win.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chrome_elf_init_win.cc b/chrome/browser/chrome_elf_init_win.cc
index 79465b8..042f3d1 100644
--- a/chrome/browser/chrome_elf_init_win.cc
+++ b/chrome/browser/chrome_elf_init_win.cc
@@ -15,10 +15,10 @@
#include "content/public/browser/browser_thread.h"
#include "version.h" // NOLINT
-namespace {
-
const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
-const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
+const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";
+
+namespace {
// How long to wait, in seconds, before reporting for the second (and last
// time), what dlls were blocked from the browser process.
@@ -82,12 +82,12 @@ void ReportSuccessfulBlocks() {
void InitializeChromeElf() {
if (base::FieldTrialList::FindFullName(kBrowserBlacklistTrialName) ==
- kBrowserBlacklistTrialEnabledGroupName) {
- BrowserBlacklistBeaconSetup();
- } else {
+ kBrowserBlacklistTrialDisabledGroupName) {
// Disable the blacklist for all future runs by removing the beacon.
base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER);
blacklist_registry_key.DeleteKey(blacklist::kRegistryBeaconPath);
+ } else {
+ BrowserBlacklistBeaconSetup();
}
// Report all successful blacklist interceptions.