Index: third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc |
diff --git a/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc b/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc |
index 7784afefc66d0e5a93d5ed7409a9ea04dbfb8a22..a96131cded48d5ab8825bf57c7b21d48ea795f80 100644 |
--- a/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc |
+++ b/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.cc |
@@ -22,6 +22,7 @@ |
#include "base/strings/stringprintf.h" |
#include "client/settings.h" |
#include "minidump/minidump_file_writer.h" |
+#include "minidump/minidump_user_extension_stream_data_source.h" |
#include "snapshot/crashpad_info_client_options.h" |
#include "snapshot/mac/process_snapshot_mac.h" |
#include "util/file/file_writer.h" |
@@ -41,11 +42,12 @@ namespace crashpad { |
CrashReportExceptionHandler::CrashReportExceptionHandler( |
CrashReportDatabase* database, |
CrashReportUploadThread* upload_thread, |
- const std::map<std::string, std::string>* process_annotations) |
+ const std::map<std::string, std::string>* process_annotations, |
+ const UserStreamDataSources* user_stream_data_sources) |
: database_(database), |
upload_thread_(upload_thread), |
- process_annotations_(process_annotations) { |
-} |
+ process_annotations_(process_annotations), |
+ user_stream_data_sources_(user_stream_data_sources) {} |
CrashReportExceptionHandler::~CrashReportExceptionHandler() { |
} |
@@ -169,6 +171,9 @@ kern_return_t CrashReportExceptionHandler::CatchMachException( |
MinidumpFileWriter minidump; |
minidump.InitializeFromSnapshot(&process_snapshot); |
+ AddUserExtensionStreams( |
+ user_stream_data_sources_, &process_snapshot, &minidump); |
+ |
if (!minidump.WriteEverything(&file_writer)) { |
Metrics::ExceptionCaptureResult( |
Metrics::CaptureResult::kMinidumpWriteFailed); |