Chromium Code Reviews| Index: android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc |
| diff --git a/android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc b/android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc |
| index 3cf45d6bdcb69101d98746613194c90e6bc661b5..17c4cea57a8c7e42fe249218abb4ad291ec2ab39 100644 |
| --- a/android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc |
| +++ b/android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc |
| @@ -156,10 +156,13 @@ void EnableCrashReporter(const std::string& process_type, int crash_signal_fd) { |
| client->set_crash_signal_fd(crash_signal_fd); |
| } |
| ::crash_reporter::SetCrashReporterClient(client); |
| - breakpad::SetShouldSanitizeDumps(true); |
| + breakpad::SanitizationInfo sanitizationInfo; |
| + sanitizationInfo.should_sanitize_dumps = true; |
| + sanitizationInfo.skip_dump_if_principal_mapping_not_referenced = false; |
|
Torne
2017/02/15 11:45:13
Can you make this line part of an #if/#else instea
gsennton
2017/02/15 17:26:42
Done.
|
| #if !defined(COMPONENT_BUILD) |
| - breakpad::SetSkipDumpIfPrincipalMappingNotReferenced( |
| - reinterpret_cast<uintptr_t>(&EnableCrashReporter)); |
| + sanitizationInfo.skip_dump_if_principal_mapping_not_referenced = true; |
| + sanitizationInfo.address_within_principal_mapping = |
| + reinterpret_cast<uintptr_t>(&EnableCrashReporter); |
| #endif |
| bool is_browser_process = |
| @@ -167,9 +170,10 @@ void EnableCrashReporter(const std::string& process_type, int crash_signal_fd) { |
| process_type == breakpad::kWebViewSingleProcessType || |
| process_type == breakpad::kBrowserProcessType; |
| if (is_browser_process) { |
| - breakpad::InitCrashReporter(""); |
| + breakpad::InitCrashReporter("", sanitizationInfo); |
| } else { |
| - breakpad::InitNonBrowserCrashReporterForAndroid(process_type); |
| + breakpad::InitNonBrowserCrashReporterForAndroid(process_type, |
| + sanitizationInfo); |
| } |
| g_enabled = true; |
| } |