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

Unified Diff: chrome_elf/chrome_elf_main.cc

Issue 2475863004: Make Crashpad start asynchronous, and move back to chrome_elf (Closed)
Patch Set: comment Created 4 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
« no previous file with comments | « chrome_elf/chrome_elf_main.h ('k') | components/crash/content/app/crashpad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « chrome_elf/chrome_elf_main.h ('k') | components/crash/content/app/crashpad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698