Adding blacklisted dlls to safe browsing incident reports.

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"
@@ skipping 95 matching lines @@
 }
 
 void AddFinchBlacklistToRegistry() {
   base::win::RegKey finch_blacklist_registry_key(
       HKEY_CURRENT_USER, blacklist::kRegistryFinchListPath, KEY_SET_VALUE);
 
   // No point in trying to continue if the registry key isn't valid.
   if (!finch_blacklist_registry_key.Valid())
     return;
 
+  // Delete and recreate the key to clear the registry.
+  finch_blacklist_registry_key.DeleteKey(L"");
+  finch_blacklist_registry_key.Create(
+      HKEY_CURRENT_USER, blacklist::kRegistryFinchListPath, KEY_SET_VALUE);

[mattm, 2014/06/19 22:46:31]

what happens with this registry entry when multiple instances of chrome are
running at once?

[grt (UTC plus 2), 2014/06/20 00:06:27]

this is a good point. in time, we may have canary, stable, beta, and dev running
concurrently. at the moment, canary and one non-canary may be running.

[krstnmnlsn, 2014/06/20 18:02:58]

To split up the registry values by channel running would require knowing the
channel very early in start up (in blacklist.cc) and that doesn't seem easy to
do (and may require code duplication).  So, for the moment at least, I will just
add a comment explaining the situation.  
I'll also make a separate CL fixing it so that chromium is not using the same
registry key.

+
   std::map<std::string, std::string> params;
   chrome_variations::GetVariationParams(kBrowserBlacklistTrialName, &params);
 
   for (std::map<std::string, std::string>::iterator it = params.begin();
        it != params.end();
        ++it) {
     std::wstring name = base::UTF8ToWide(it->first);
     std::wstring val = base::UTF8ToWide(it->second);
 
     finch_blacklist_registry_key.WriteValue(name.c_str(), val.c_str());
@@ skipping 50 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);
   }
 }