Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

Unified Diff: trunk/src/chrome_elf/blacklist/test/blacklist_test.cc

Issue 164833002: Revert 251095 "Revert 250828 "Add a UMA stat to track if the Bro..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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, &current_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());
« no previous file with comments | « trunk/src/chrome_elf/blacklist/blacklist.cc ('k') | trunk/src/chrome_elf/blacklist/test/blacklist_test_main_dll.def » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698