Switching the no-finch default behavior to enable the 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 "testing/gtest/include/gtest/gtest.h"
 #include "version.h"  // NOLINT
 
 class ChromeBlacklistTrialTest : public testing::Test {
  protected:
   ChromeBlacklistTrialTest() {}
   virtual ~ChromeBlacklistTrialTest() {}
 
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
@@ skipping 23 matching lines @@
     return blacklist_version;
   }
 
   scoped_ptr<base::win::RegKey> blacklist_registry_key_;
   registry_util::RegistryOverrideManager override_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeBlacklistTrialTest);
 };
 
+// Ensure that the default trial sets up the blacklist beacons.
+TEST_F(ChromeBlacklistTrialTest, DefaultRun) {
+  // Set some dummy values as beacons.
+  blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
+                                      blacklist::BLACKLIST_DISABLED);
+  blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
 
-// Ensure that the default trial deletes any existing blacklist beacons.
-TEST_F(ChromeBlacklistTrialTest, DefaultRun) {
+  // This setup code should result in the default group, which should have
+  // the blacklist set up.
+  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 some dummy values as beacons.

[csharp, 2014/05/16 18:35:14]

These are enabled values, not dummy values

[krstnmnlsn, 2014/05/16 20:37:08]

Done.

   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_ENABLED);
   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
 
-  // This setup code should result in the default group, which should remove
-  // all the beacon values.
+  // Create the field trial with the Blacklist disabled group

[csharp, 2014/05/16 18:35:14]

nit: Blacklist -> blacklist, missing .

[krstnmnlsn, 2014/05/16 20:37:08]

Done.

+  base::FieldTrialList field_trial_list(
+    new metrics::SHA1EntropyProvider("test"));
+
+  scoped_refptr<base::FieldTrial> trial(
+    base::FieldTrialList::CreateFieldTrial(
+      kBrowserBlacklistTrialDisabledGroupName, kBrowserBlacklistTrialName));
+
+  // This setup code should now delete any existing blacklist beacons

[csharp, 2014/05/16 18:35:14]

nit: missing .

[krstnmnlsn, 2014/05/16 20:37:08]

Done.

   InitializeChromeElf();
 
-  // Ensure that invalid values are returned to indicate that the
-  // beacon values are gone.
+  // Ensure invalid values are returned to indicate that the beacon
+  // values are indeed gone.
   ASSERT_EQ(blacklist::BLACKLIST_STATE_MAX, GetBlacklistState());
   ASSERT_EQ(base::string16(), GetBlacklistVersion());
 }
 
 TEST_F(ChromeBlacklistTrialTest, VerifyFirstRun) {
   BrowserBlacklistBeaconSetup();
 
   // Verify the state is properly set after the first run.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
 
@@ skipping 54 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());
 }