summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authorgunsch <gunsch@chromium.org>2015-04-21 12:08:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-21 19:09:10 +0000
commita12fcf00ae600a2245194dc4882b7214268c34c5 (patch)
tree6fa0e4f0821eaf942947083e1baad20d2460e724 /chromecast
parent5cc50b558cfa7ee06de13e3449c3d029c63e003f (diff)
downloadchromium_src-a12fcf00ae600a2245194dc4882b7214268c34c5.zip
chromium_src-a12fcf00ae600a2245194dc4882b7214268c34c5.tar.gz
chromium_src-a12fcf00ae600a2245194dc4882b7214268c34c5.tar.bz2
Chromecast: make HandleCrash a FilterCallback in ATV crash path.
R=lcwu@chromium.org,byungchul@chromium.org BUG=internal b/19594886 Review URL: https://codereview.chromium.org/1092113002 Cr-Commit-Position: refs/heads/master@{#326090}
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/crash/android/crash_handler.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/chromecast/crash/android/crash_handler.cc b/chromecast/crash/android/crash_handler.cc
index 3b19546..1c42dfa 100644
--- a/chromecast/crash/android/crash_handler.cc
+++ b/chromecast/crash/android/crash_handler.cc
@@ -26,15 +26,13 @@ namespace {
chromecast::CrashHandler* g_crash_handler = NULL;
-// ExceptionHandler requires a HandlerCallback as a function pointer. This
-// function exists to proxy into the global CrashHandler instance.
-bool HandleCrash(const void* /* crash_context */,
- size_t /* crash_context_size */,
- void* /* context */) {
+bool HandleCrash(void* /* crash_context */) {
DCHECK(g_crash_handler);
g_crash_handler->UploadCrashDumps();
- // Let the exception continue to propagate up to the system.
+ // TODO(gunsch): clean up the ATV crash handling code.
+ // Don't write another minidump. Chrome's default ExceptionHandler has already
+ // written a minidump by this point in the crash handling sequence.
return false;
}
@@ -100,8 +98,7 @@ void CrashHandler::Initialize(const std::string& process_type) {
// Dummy MinidumpDescriptor just to start up another ExceptionHandler.
google_breakpad::MinidumpDescriptor dummy(crash_dump_path_.value());
crash_uploader_.reset(new google_breakpad::ExceptionHandler(
- dummy, NULL, NULL, NULL, true, -1));
- crash_uploader_->set_crash_handler(&::HandleCrash);
+ dummy, &HandleCrash, NULL, NULL, true, -1));
breakpad::InitCrashReporter(process_type);