[chrome_elf] Removing blacklist finch for dynamic dll changes.

chrome/browser/win/chrome_elf_init.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 "chrome/browser/win/chrome_elf_init.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
@@ skipping 77 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 successful 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));
 }
 
-// Note that running multiple chrome instances with distinct user data
-// directories could lead to deletion (and/or replacement) of the finch
-// blacklist registry data in one instance before the second has a chance to
-// read those values.
-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);
-
-  std::map<std::string, std::string> params;
-  std::string value = variations::GetVariationParamValue(
-      kBrowserBlacklistTrialName, blacklist::kRegistryFinchListValueNameStr);
-  if (value.empty())
-    return;
-  base::string16 value_wcs = base::UTF8ToWide(value);
-
-  // The dll names are comma-separated in this param value.  We need to turn
-  // this into REG_MULTI_SZ format (double-null terminates).
-  // Note that the strings are wide character in registry.
-  value_wcs.push_back(L'\0');
-  value_wcs.push_back(L'\0');
-  std::replace(value_wcs.begin(), value_wcs.end(), L',', L'\0');
-
-  finch_blacklist_registry_key.WriteValue(
-      blacklist::kRegistryFinchListValueName, value_wcs.data(),
-      (value_wcs.size() * sizeof(wchar_t)), REG_MULTI_SZ);
-}
-
 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 45 matching lines @@
 
     blacklist_registry_key.WriteValue(blacklist::kBeaconAttemptCount,
                                       static_cast<DWORD>(0));
 
     // 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);
   }
 }