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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 36 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 deletes any existing blacklist beacons.
+// Ensure that the default trial sets up the blacklist beacons.
 TEST_F(ChromeBlacklistTrialTest, DefaultRun) {

[Cait (Slow), 2014/05/15 18:43:19]

This looks a lot like the test below it "VerifyFirstRun" now  -- is it worth
adding a test to confirm that users in the "BlacklistDisabled" Finch group are
still having their blacklists disabled (if there are any users in that group any
more)?

[csharp, 2014/05/15 20:09:39]

Yup, that is probably a good idea :)

[krstnmnlsn, 2014/05/16 14:15:03]

Done.

   // Set some dummy values as beacons.
   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
-                                      blacklist::BLACKLIST_ENABLED);
+                                      blacklist::BLACKLIST_DISABLED);
   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
+  // the blacklist set up.
   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 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());
 }
 
 TEST_F(ChromeBlacklistTrialTest, VerifyFirstRun) {
   BrowserBlacklistBeaconSetup();
 
   // Verify the state is properly set after the first run.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
 
   chrome::VersionInfo version_info;
   base::string16 version(base::UTF8ToUTF16(version_info.Version()));
@@ skipping 52 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());
 }