[chrome_elf] Removing blacklist finch for dynamic dll changes.

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 <stddef.h>
 
 #include <memory>
 
 #include "base/environment.h"
 #include "base/files/file.h"
@@ skipping 19 matching lines @@
 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[];
 
 namespace {
 
 // Functions we need from blacklist_test_main_dll.dll
-typedef void (*TestDll_AddDllsFromRegistryToBlacklistFunction)();
 typedef bool (*TestDll_AddDllToBlacklistFunction)(const wchar_t* dll_name);
 typedef int (*TestDll_BlacklistSizeFunction)();
 typedef void (*TestDll_BlockedDllFunction)(size_t blocked_index);
 typedef int (*TestDll_GetBlacklistIndexFunction)(const wchar_t* dll_name);
 typedef bool (*TestDll_IsBlacklistInitializedFunction)();
 typedef bool (*TestDll_RemoveDllFromBlacklistFunction)(const wchar_t* dll_name);
 typedef bool (*TestDll_SuccessfullyBlockedFunction)(
     const wchar_t** blocked_dlls,
     int* size);
 typedef void (*InitTestDllFunction)();
 
-TestDll_AddDllsFromRegistryToBlacklistFunction
-    TestDll_AddDllsFromRegistryToBlacklist = nullptr;
 TestDll_AddDllToBlacklistFunction TestDll_AddDllToBlacklist = nullptr;
 TestDll_BlacklistSizeFunction TestDll_BlacklistSize = nullptr;
 TestDll_BlockedDllFunction TestDll_BlockedDll = nullptr;
 TestDll_GetBlacklistIndexFunction TestDll_GetBlacklistIndex = nullptr;
 TestDll_IsBlacklistInitializedFunction TestDll_IsBlacklistInitialized = nullptr;
 TestDll_RemoveDllFromBlacklistFunction TestDll_RemoveDllFromBlacklist = nullptr;
 TestDll_SuccessfullyBlockedFunction TestDll_SuccessfullyBlocked = nullptr;
 InitTestDllFunction InitTestDll = nullptr;
 
 struct TestData {
@@ skipping 89 matching lines @@
 
     // Make the override path available to our test DLL.
     IpcOverrides();
 
     // Load the main test Dll now.
     // Note: this has to happen after we set up the registry overrides.
     HMODULE dll = nullptr;
     dll = ::LoadLibraryW(L"blacklist_test_main_dll.dll");
     if (!dll)
       return;
-    TestDll_AddDllsFromRegistryToBlacklist =
-        reinterpret_cast<TestDll_AddDllsFromRegistryToBlacklistFunction>(
-            ::GetProcAddress(dll, "TestDll_AddDllsFromRegistryToBlacklist"));
     TestDll_AddDllToBlacklist =
         reinterpret_cast<TestDll_AddDllToBlacklistFunction>(
             ::GetProcAddress(dll, "TestDll_AddDllToBlacklist"));
     TestDll_BlacklistSize = reinterpret_cast<TestDll_BlacklistSizeFunction>(
         ::GetProcAddress(dll, "TestDll_BlacklistSize"));
     TestDll_BlockedDll = reinterpret_cast<TestDll_BlockedDllFunction>(
         ::GetProcAddress(dll, "TestDll_BlockedDll"));
     TestDll_GetBlacklistIndex =
         reinterpret_cast<TestDll_GetBlacklistIndexFunction>(
             ::GetProcAddress(dll, "TestDll_GetBlacklistIndex"));
     TestDll_IsBlacklistInitialized =
         reinterpret_cast<TestDll_IsBlacklistInitializedFunction>(
             ::GetProcAddress(dll, "TestDll_IsBlacklistInitialized"));
     TestDll_RemoveDllFromBlacklist =
         reinterpret_cast<TestDll_RemoveDllFromBlacklistFunction>(
             ::GetProcAddress(dll, "TestDll_RemoveDllFromBlacklist"));
     TestDll_SuccessfullyBlocked =
         reinterpret_cast<TestDll_SuccessfullyBlockedFunction>(
             ::GetProcAddress(dll, "TestDll_SuccessfullyBlocked"));
     InitTestDll = reinterpret_cast<InitTestDllFunction>(
         ::GetProcAddress(dll, "InitTestDll"));
-    if (!TestDll_AddDllsFromRegistryToBlacklist || !TestDll_AddDllToBlacklist ||
-        !TestDll_BlacklistSize || !TestDll_BlockedDll ||
-        !TestDll_GetBlacklistIndex || !TestDll_IsBlacklistInitialized ||
-        !TestDll_RemoveDllFromBlacklist || !TestDll_SuccessfullyBlocked ||
-        !InitTestDll)
+    if (!TestDll_AddDllToBlacklist || !TestDll_BlacklistSize ||
+        !TestDll_BlockedDll || !TestDll_GetBlacklistIndex ||
+        !TestDll_IsBlacklistInitialized || !TestDll_RemoveDllFromBlacklist ||
+        !TestDll_SuccessfullyBlocked || !InitTestDll)
       return;
 
     // We have to call this exported function every time this test setup runs.
     // If the tests are running in single process mode, the test DLL does not
     // get reloaded everytime - but we need to make sure it updates
     // appropriately.
     InitTestDll();
 
     blacklist_registry_key_.reset(
         new base::win::RegKey(HKEY_CURRENT_USER,
@@ skipping 107 matching lines @@
   TestDll_SuccessfullyBlocked(NULL, &num_blocked_dlls);
   EXPECT_EQ(num_initially_blocked_, num_blocked_dlls);
 
   // Add all DLLs to the blacklist then check they are blocked.
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     EXPECT_TRUE(TestDll_AddDllToBlacklist(test_data[i].dll_name));
   }
   CheckBlacklistedDllsNotLoaded();
 }
 
-TEST_F(BlacklistTest, AddDllsFromRegistryToBlacklist) {
-  // Ensure that the blacklist is loaded.
-  ASSERT_TRUE(TestDll_IsBlacklistInitialized());
-
-  // Delete the finch registry key to clear its values.
-  base::win::RegKey key(HKEY_CURRENT_USER,
-                        blacklist::kRegistryFinchListPath,
-                        KEY_QUERY_VALUE | KEY_SET_VALUE);
-  key.DeleteKey(L"");
-
-  // Add the test dlls to the registry.
-  // (REG_MULTI_SZ: eos separated, double null terminated.)
-  base::win::RegKey finch_blacklist_registry_key(
-      HKEY_CURRENT_USER,
-      blacklist::kRegistryFinchListPath,
-      KEY_QUERY_VALUE | KEY_SET_VALUE);
-
-  std::vector<wchar_t>(reg_buffer);
-  for (size_t i = 0; i < arraysize(test_data); ++i) {
-    if (reg_buffer.size() > 0)
-      reg_buffer.push_back(L'\0');
-    const wchar_t* dll = test_data[i].dll_name;
-    // Append the name, not including terminator.
-    reg_buffer.insert(reg_buffer.end(), dll, dll + ::wcslen(dll));
-  }
-  reg_buffer.push_back(L'\0');
-  reg_buffer.push_back(L'\0');
-
-  finch_blacklist_registry_key.WriteValue(
-      blacklist::kRegistryFinchListValueName, reg_buffer.data(),
-      (DWORD)(reg_buffer.size() * sizeof(wchar_t)), REG_MULTI_SZ);
-
-  TestDll_AddDllsFromRegistryToBlacklist();
-  CheckBlacklistedDllsNotLoaded();
-}
-
 void TestResetBeacon(std::unique_ptr<base::win::RegKey>& key,
                      DWORD input_state,
                      DWORD expected_output_state) {
   LONG result = key->WriteValue(blacklist::kBeaconState, input_state);
   EXPECT_EQ(ERROR_SUCCESS, result);
 
   EXPECT_TRUE(blacklist::ResetBeacon());
   DWORD blacklist_state = blacklist::BLACKLIST_STATE_MAX;
   result = key->ReadValueDW(blacklist::kBeaconState, &blacklist_state);
   EXPECT_EQ(ERROR_SUCCESS, result);
@@ skipping 60 matching lines @@
                                        &blacklist_state);
   EXPECT_EQ(blacklist_state, blacklist::BLACKLIST_SETUP_RUNNING);
 
   DWORD attempt_count = blacklist::kBeaconMaxAttempts;
   blacklist_registry_key_->ReadValueDW(blacklist::kBeaconAttemptCount,
                                        &attempt_count);
   EXPECT_EQ(static_cast<DWORD>(0), attempt_count);
 }
 
 }  // namespace