Finch Blacklist is now added to the Hardcoded 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 "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "version.h"  // NOLINT
 
 const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
 const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";
+const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";

[csharp, 2014/05/29 20:51:52]

Seems to be unused, remove?

[krstnmnlsn, 2014/05/30 14:09:13]

Done.

 
 namespace {
 
 // 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
@@ skipping 50 matching lines @@
 
 }  // namespace
 
 void InitializeChromeElf() {
   if (base::FieldTrialList::FindFullName(kBrowserBlacklistTrialName) ==
       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 {
+    AddFinchBlacklistToRegistry();
     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,
       FROM_HERE,
       base::Bind(&ReportSuccessfulBlocks),
       base::TimeDelta::FromSeconds(kBlacklistReportingDelaySec));
 }
 
+void AddFinchBlacklistToRegistry() {
+  std::map<std::string, std::string> params;
+  if (chrome_variations::GetVariationParams(kBrowserBlacklistTrialName,
+      &params)) {
+  base::win::RegKey finch_blacklist_registry_key(HKEY_CURRENT_USER,

[csharp, 2014/05/29 20:51:52]

Incorrect indent (same for the following two lines). "git cl format" might fix
this for you.

[krstnmnlsn, 2014/05/30 14:09:13]

Done.

+                                  blacklist::kRegistryFinchListPath,
+                                  KEY_QUERY_VALUE | KEY_SET_VALUE);
+
+  // No point in trying to continue if the registry key isn't valid.

[csharp, 2014/05/29 20:51:52]

Should be indented 2 more spaces

[krstnmnlsn, 2014/05/30 14:09:13]

Done.

+  if (!finch_blacklist_registry_key.Valid())
+    return;
+
+    std::map<std::string, std::string>::iterator it = params.begin();
+    while (it != params.end()) {
+      const char* name_str = (it->first).c_str();

[csharp, 2014/05/29 20:51:52]

The converting can be done with:
std::wstring wide_string = base::UTF8ToWide(string);
wide_string.c_str()

less code and no manually frees/deletes :)

[krstnmnlsn, 2014/05/30 14:09:13]

this is great!

+      const char* val_str = (it->second).c_str();
+      size_t name_len = MultiByteToWideChar(CP_UTF8, 0, name_str, -1, NULL, 0);
+      size_t val_len = MultiByteToWideChar(CP_UTF8, 0, val_str, -1, NULL, 0);
+      wchar_t* name = new wchar_t[name_len];
+      wchar_t* val = new wchar_t[val_len];
+      MultiByteToWideChar(CP_UTF8, 0, name_str, -1, name, name_len);
+      MultiByteToWideChar(CP_UTF8, 0, val_str, -1, val, val_len);
+      finch_blacklist_registry_key.WriteValue(name, val);
+
+      delete[] name;
+      delete[] val;
+
+      ++it;
+    }
+  }
+}
+
 void BrowserBlacklistBeaconSetup() {
   base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER,
                                            blacklist::kRegistryBeaconPath,
                                            KEY_QUERY_VALUE | KEY_SET_VALUE);
 
   // No point in trying to continue if the registry key isn't valid.
   if (!blacklist_registry_key.Valid())
     return;
 
   // Record the results of the last blacklist setup.
@@ skipping 37 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);
   }
 }