Switching the no-finch default behavior to enable the blacklist

chrome/browser/chrome_elf_init_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/chrome_elf_init_win.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/dll_hash/dll_hash.h"
 #include "content/public/browser/browser_thread.h"
 #include "version.h"  // NOLINT
 
+const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
+const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";
+
 namespace {
 
-const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
-const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
-
 // How long to wait, in seconds, before reporting for the second (and last
 // time), what dlls were blocked from the browser process.
 const int kBlacklistReportingDelaySec = 600;
 
 // This enum is used to define the buckets for an enumerated UMA histogram.
 // Hence,
 //   (a) existing enumerated constants should never be deleted or reordered, and
 //   (b) new constants should only be appended in front of
 //       BLACKLIST_SETUP_EVENT_MAX.
 enum BlacklistSetupEventType {
@@ skipping 42 matching lines @@
     int uma_hash = DllNameToHash(dll_name_utf8);
 
     UMA_HISTOGRAM_SPARSE_SLOWLY("Blacklist.Blocked", uma_hash);
   }
 }
 
 }  // namespace
 
 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.
   ReportSuccessfulBlocks();
 
   // Schedule another task to report all sucessful interceptions later.
   // This time delay should be long enough to catch any dlls that attempt to
   // inject after Chrome has started up.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI,
@@ skipping 52 matching lines @@
     LONG set_state = blacklist_registry_key.WriteValue(
         blacklist::kBeaconState,
         blacklist::BLACKLIST_ENABLED);
 
     // Only report the blacklist as getting setup when both registry writes
     // succeed, since otherwise the blacklist wasn't properly setup.
     if (set_version == ERROR_SUCCESS && set_state == ERROR_SUCCESS)
       RecordBlacklistSetupEvent(BLACKLIST_SETUP_ENABLED);
   }
 }