Finch Blacklist is now added to the Hardcoded blacklist.

chrome/browser/chrome_elf_init_unittest_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 "chrome/browser/chrome_elf_init_win.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "components/variations/entropy_provider.h"
+#include "components/variations/variations_associated_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "version.h"  // NOLINT
 
+namespace {
+
+const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
+
 class ChromeBlacklistTrialTest : public testing::Test {
  protected:
   ChromeBlacklistTrialTest() {}
   virtual ~ChromeBlacklistTrialTest() {}
 
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
 
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER,
                                        L"browser_blacklist_test");
@@ skipping 39 matching lines @@
   InitializeChromeElf();
 
   // Ensure the beacon values are now correct, indicating the
   // blacklist beacon was setup.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
   chrome::VersionInfo version_info;
   base::string16 version(base::UTF8ToUTF16(version_info.Version()));
   ASSERT_EQ(version, GetBlacklistVersion());
 }
 
-
 // Ensure that the blacklist is disabled for any users in the
 // "BlacklistDisabled" finch group.
 TEST_F(ChromeBlacklistTrialTest, BlacklistDisabledRun) {
   // Set the beacons to enabled values.
   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_ENABLED);
   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
 
   // Create the field trial with the blacklist disabled group.
   base::FieldTrialList field_trial_list(
@@ skipping 75 matching lines @@
 
   BrowserBlacklistBeaconSetup();
 
   // The beacon should now be marked as enabled for the current version.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
 
   chrome::VersionInfo version_info;
   base::string16 expected_version(base::UTF8ToUTF16(version_info.Version()));
   ASSERT_EQ(expected_version, GetBlacklistVersion());
 }
+
+TEST_F(ChromeBlacklistTrialTest, AddFinchBlacklistToRegistry) {
+  // Create the field trial with the blacklist enabled group.
+  base::FieldTrialList field_trial_list(
+      new metrics::SHA1EntropyProvider("test"));
+
+  scoped_refptr<base::FieldTrial> trial(base::FieldTrialList::CreateFieldTrial(
+      kBrowserBlacklistTrialName, kBrowserBlacklistTrialEnabledGroupName));
+
+  // Set up the trial with the desired parameters.
+  std::map<std::string, std::string> desired_params;
+  desired_params["TestDllName1"] = "TestDll1.dll";
+  desired_params["TestDllName2"] = "TestDll2.dll";
+
+  chrome_variations::AssociateVariationParams(
+      kBrowserBlacklistTrialName,
+      kBrowserBlacklistTrialEnabledGroupName,
+      desired_params);
+
+  // This should add the dll's in those parameters to the registry.

[robertshield, 2014/05/30 21:07:08]

s/dll's/dlls

[krstnmnlsn, 2014/06/02 14:00:37]

Done.

+  AddFinchBlacklistToRegistry();
+
+  // Check that the set of values in the registry is the same
+  // as those in desired_params by comparing size and containment one way.
+  base::win::RegKey finch_blacklist_registry_key(
+      HKEY_CURRENT_USER,
+      blacklist::kRegistryFinchListPath,
+      KEY_QUERY_VALUE | KEY_SET_VALUE);
+
+  ASSERT_EQ(desired_params.size(),
+            finch_blacklist_registry_key.GetValueCount());
+
+  std::map<std::string, std::string>::iterator it = desired_params.begin();
+  while (it != desired_params.end()) {

[robertshield, 2014/05/30 21:07:08]

minor nit, this form:

for (; it != desired_params.end(); ++it) {
...
}

keeps all the loop-related stuff in one place and is slightly more conventional.

[krstnmnlsn, 2014/06/02 14:00:37]

Done.

+    std::wstring name = base::UTF8ToWide(it->first);
+    const wchar_t* name_cstr = name.c_str();

[robertshield, 2014/05/30 21:07:08]

why create the name_cstr temporary?

adding |name| increases readability, but this second one doesn't seem to.

[krstnmnlsn, 2014/06/02 14:00:37]

Done.

+
+    ASSERT_TRUE(finch_blacklist_registry_key.HasValue(name_cstr));
+    ++it;
+  }
+}
+
+}  // namespace