Index: trunk/src/chrome_elf/blacklist/test/blacklist_test.cc |
=================================================================== |
--- trunk/src/chrome_elf/blacklist/test/blacklist_test.cc (revision 251130) |
+++ trunk/src/chrome_elf/blacklist/test/blacklist_test.cc (working copy) |
@@ -32,6 +32,7 @@ |
// functions on the test blacklist dll, not the ones linked into the test |
// executable itself. |
__declspec(dllimport) bool TestDll_AddDllToBlacklist(const wchar_t* dll_name); |
+__declspec(dllimport) bool TestDLL_IsBlacklistInitialized(); |
__declspec(dllimport) bool TestDll_RemoveDllFromBlacklist( |
const wchar_t* dll_name); |
} |
@@ -120,6 +121,9 @@ |
base::FilePath current_dir; |
ASSERT_TRUE(PathService::Get(base::DIR_EXE, ¤t_dir)); |
+ // Ensure that the blacklist is loaded. |
+ ASSERT_TRUE(TestDLL_IsBlacklistInitialized()); |
+ |
// Test that an un-blacklisted DLL can load correctly. |
base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName1)); |
EXPECT_TRUE(dll1.is_valid()); |