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

Unified Diff: chrome_elf/blacklist/test/blacklist_test_main_dll.cc

Issue 118343004: Reland of http://crrev.com/241548. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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: chrome_elf/blacklist/test/blacklist_test_main_dll.cc
diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc
similarity index 51%
copy from chrome_elf/chrome_elf_main.cc
copy to chrome_elf/blacklist/test/blacklist_test_main_dll.cc
index 4291430970496b6f13d2aec4113c61ce3c86b286..54e5eb8af96db901b87929806d6648643c2020b2 100644
--- a/chrome_elf/chrome_elf_main.cc
+++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc
@@ -4,17 +4,14 @@
#include <windows.h>
-#include "chrome_elf/chrome_elf_main.h"
+#include "chrome_elf/blacklist/blacklist.h"
-#include "chrome_elf/ntdll_cache.h"
-
-void InitChromeElf() {
- // This method is a no-op which may be called to force a load-time dependency
- // on chrome_elf.dll.
-}
+extern "C" void InitBlacklistTestDll() {}
BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
- if (reason == DLL_PROCESS_ATTACH)
- InitCache();
+ if (reason == DLL_PROCESS_ATTACH) {
+ blacklist::Initialize(true); // force always on, no beacon
+ }
+
return TRUE;
}
« no previous file with comments | « chrome_elf/blacklist/test/blacklist_test_main_dll.h ('k') | chrome_elf/blacklist/test/blacklist_test_main_dll.def » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698