Switching the no-finch default behavior to enable the blacklist

chrome/browser/chrome_elf_init_unittest_win.cc

Index: chrome/browser/chrome_elf_init_unittest_win.cc
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
index b7cee8af896a99a6487b227ea91689dc24c476e9..adb2d47e2ee6b1a558f37e9c9185eb64b1ab361c 100644
--- a/chrome/browser/chrome_elf_init_unittest_win.cc
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -54,22 +54,23 @@ class ChromeBlacklistTrialTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(ChromeBlacklistTrialTest);
 };
 
-
-// Ensure that the default trial deletes any existing blacklist beacons.
+// 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_ENABLED);

[csharp, 2014/05/15 18:15:58]

This value should be changed to disabled (so we know the initialization actually
changed it)

[krstnmnlsn, 2014/05/15 18:30:00]

Done.

   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
 
-  // This setup code should result in the default group, which should remove
-  // all the beacon values.
+  // This setup code should result in the default group, which should have
+  // all the beacon values set.

[csharp, 2014/05/15 18:15:58]

nit "all the beacon values set"-> "the blacklist setup."

[krstnmnlsn, 2014/05/15 18:30:00]

Done.

   InitializeChromeElf();
 
-  // Ensure that invalid values are returned to indicate that the
-  // beacon values are gone.
-  ASSERT_EQ(blacklist::BLACKLIST_STATE_MAX, GetBlacklistState());
-  ASSERT_EQ(base::string16(), GetBlacklistVersion());
+  // Ensure the beacon values are 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());
 }
 
 TEST_F(ChromeBlacklistTrialTest, VerifyFirstRun) {