Index: chrome_elf/chrome_elf_main.cc |
diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc |
index 95e0a415c41cb988fb256fe91ce2a12e9567d437..badf910bd428a434f0dfafffb14e94a46a9b810e 100644 |
--- a/chrome_elf/chrome_elf_main.cc |
+++ b/chrome_elf/chrome_elf_main.cc |
@@ -11,23 +11,15 @@ |
#include "chrome_elf/blacklist/blacklist.h" |
#include "chrome_elf/crash/crash_helper.h" |
-// This function is a temporary workaround for https://crbug.com/655788. We |
-// need to come up with a better way to initialize crash reporting that can |
-// happen inside DllMain(). |
-void SignalInitializeCrashReporting() { |
- if (!elf_crash::InitializeCrashReporting()) { |
-#ifdef _DEBUG |
- assert(false); |
-#endif // _DEBUG |
- } |
-} |
- |
void SignalChromeElf() { |
blacklist::ResetBeacon(); |
} |
BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { |
if (reason == DLL_PROCESS_ATTACH) { |
+ if (!elf_crash::InitializeCrashReporting()) { |
+ assert(false); |
+ } |
// CRT on initialization installs an exception filter which calls |
// TerminateProcess. We need to hook CRT's attempt to set an exception. |
// NOTE: Do not hook if ASan is present, or ASan will fail to install |