Index: chrome/browser/win/chrome_elf_init.cc |
diff --git a/chrome/browser/win/chrome_elf_init.cc b/chrome/browser/win/chrome_elf_init.cc |
index a0a4f482548e1d1253e33ac18f240e6a2b80d31c..5c091296c46aa393c7ca68a47c3c5139a3b0b775 100644 |
--- a/chrome/browser/win/chrome_elf_init.cc |
+++ b/chrome/browser/win/chrome_elf_init.cc |
@@ -95,7 +95,6 @@ void InitializeChromeElf() { |
base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER); |
blacklist_registry_key.DeleteKey(blacklist::kRegistryBeaconPath); |
} else { |
- AddFinchBlacklistToRegistry(); |
BrowserBlacklistBeaconSetup(); |
} |
@@ -112,42 +111,6 @@ void InitializeChromeElf() { |
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, |