Revert 243967 "Use a Finch Experiment to control the Browser Bla..."

trunk/src/chrome_elf/blacklist/test/blacklist_test.cc

 // Copyright 2013 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 "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/blacklist/test/blacklist_test_main_dll.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "version.h"  // NOLINT
 
 const wchar_t kTestDllName1[] = L"blacklist_test_dll_1.dll";
 const wchar_t kTestDllName2[] = L"blacklist_test_dll_2.dll";
 const wchar_t kTestDllName3[] = L"blacklist_test_dll_3.dll";
 
 const wchar_t kDll2Beacon[] = L"{F70A0100-2889-4629-9B44-610FE5C73231}";
 const wchar_t kDll3Beacon[] = L"{9E056AEC-169E-400c-B2D0-5A07E3ACE2EB}";
 
 extern const wchar_t* kEnvVars[];
 
 extern "C" {
 // When modifying the blacklist in the test process, use the exported test dll
 // functions on the test blacklist dll, not the ones linked into the test
 // executable itself.
 __declspec(dllimport) void TestDll_AddDllToBlacklist(const wchar_t* dll_name);
 __declspec(dllimport) void TestDll_RemoveDllFromBlacklist(
     const wchar_t* dll_name);
 }
 
 class BlacklistTest : public testing::Test {
   virtual void SetUp() {
     // Force an import from blacklist_test_main_dll.
     InitBlacklistTestDll();
+
+    // Ensure that the beacon state starts off cleared.
+    blacklist::ClearBeacon();
   }
 
   virtual void TearDown() {
     TestDll_RemoveDllFromBlacklist(kTestDllName1);
     TestDll_RemoveDllFromBlacklist(kTestDllName2);
   }
 };
 
 TEST_F(BlacklistTest, Beacon) {
   registry_util::RegistryOverrideManager override_manager;
   override_manager.OverrideRegistry(HKEY_CURRENT_USER, L"beacon_test");
 
-  // Ensure that the beacon state starts off enabled for this version.
-  DWORD blacklist_state = blacklist::BLACKLIST_ENABLED;
-  LONG result = ::RegSetKeyValue(HKEY_CURRENT_USER,
-                                 blacklist::kRegistryBeaconPath,
-                                 blacklist::kBeaconState,
-                                 REG_DWORD,
-                                 &blacklist_state,
-                                 sizeof(blacklist_state));
-  ASSERT_EQ(result, ERROR_SUCCESS);
+  // First call should succeed as the beacon is newly created.
+  EXPECT_TRUE(blacklist::CreateBeacon());
 
-  result = ::RegSetKeyValue(HKEY_CURRENT_USER,
-                            blacklist::kRegistryBeaconPath,
-                            blacklist::kBeaconVersion,
-                            REG_SZ,
-                            TEXT(CHROME_VERSION_STRING),
-                            sizeof(TEXT(CHROME_VERSION_STRING)));
-  ASSERT_EQ(result, ERROR_SUCCESS);
+  // Second call should fail indicating the beacon already existed.
+  EXPECT_FALSE(blacklist::CreateBeacon());
 
-  // First call should find the beacon and reset it.
-  EXPECT_TRUE(blacklist::ResetBeacon());
+  // First call should find the beacon and delete it.
+  EXPECT_TRUE(blacklist::ClearBeacon());
 
-  // First call should succeed as the beacon is enabled.
-  EXPECT_TRUE(blacklist::LeaveSetupBeacon());
-
-  // Second call should fail indicating the beacon wasn't set as enabled.
-  EXPECT_FALSE(blacklist::LeaveSetupBeacon());
-
-  // Resetting the beacon should work when setup beacon is present.
-  EXPECT_TRUE(blacklist::ResetBeacon());
-
-  // Change the version and ensure that the setup fails due to the version
-  // mismatch.
-  base::string16 different_version(L"other_version");
-  ASSERT_NE(different_version, TEXT(CHROME_VERSION_STRING));
-
-  result = ::RegSetKeyValue(HKEY_CURRENT_USER,
-                            blacklist::kRegistryBeaconPath,
-                            blacklist::kBeaconVersion,
-                            REG_SZ,
-                            different_version.c_str(),
-                            sizeof(different_version));
-  ASSERT_EQ(result, ERROR_SUCCESS);
-
-  EXPECT_FALSE(blacklist::LeaveSetupBeacon());
+  // Second call should fail to find the beacon and delete it.
+  EXPECT_FALSE(blacklist::ClearBeacon());
 }
 
 TEST_F(BlacklistTest, AddAndRemoveModules) {
   EXPECT_TRUE(blacklist::AddDllToBlacklist(L"foo.dll"));
   // Adding the same item twice should be idempotent.
   EXPECT_TRUE(blacklist::AddDllToBlacklist(L"foo.dll"));
   EXPECT_TRUE(blacklist::RemoveDllFromBlacklist(L"foo.dll"));
   EXPECT_FALSE(blacklist::RemoveDllFromBlacklist(L"foo.dll"));
 
   std::vector<base::string16> added_dlls;
@@ skipping 42 matching lines @@
     // Remove the DLL from the blacklist. Ensure that it loads and that its
     // entry point was called.
     TestDll_RemoveDllFromBlacklist(test_data[i].dll_name);
     base::ScopedNativeLibrary dll(current_dir.Append(test_data[i].dll_name));
     EXPECT_TRUE(dll.is_valid());
     EXPECT_NE(0u, ::GetEnvironmentVariable(test_data[i].dll_beacon, NULL, 0));
     dll.Reset(NULL);
   }
 #endif
 }