Index: chrome_elf/chrome_elf_main.cc |
diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc |
index cf2cb56dd043476cba6bfd735692f5cc47187482..cbb9a00e2e4ed62258eb5d8eb0734b0cac2f4463 100644 |
--- a/chrome_elf/chrome_elf_main.cc |
+++ b/chrome_elf/chrome_elf_main.cc |
@@ -14,17 +14,6 @@ |
#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(); |
} |
@@ -55,6 +44,10 @@ BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { |
if (reason == DLL_PROCESS_ATTACH) { |
install_static::InitializeProductDetailsForPrimaryModule(); |
+ 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. |
elf_crash::DisableSetUnhandledExceptionFilter(); |