Fix minidump-generation for debug builds.

android_webview/common/crash_reporter/aw_microdump_crash_reporter.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/common/crash_reporter/aw_microdump_crash_reporter.h"
 
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
@@ skipping 138 matching lines @@
     LOG(WARNING) << "Can't use breakpad to handle WebView crashes";
     return;
   }
 #endif
 
   AwCrashReporterClient* client = g_crash_reporter_client.Pointer();
   if (process_type == switches::kRendererProcess && crash_signal_fd != -1) {
     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 instead of setting it to one value
and then overwriting it?

[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 =
       process_type.empty() ||
       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;
 }
 
 bool GetCrashDumpLocation(base::FilePath* crash_dir) {
   return g_crash_reporter_client.Get().GetCrashDumpLocation(crash_dir);
 }
 
 void AddGpuFingerprintToMicrodumpCrashHandler(
     const std::string& gpu_fingerprint) {
   breakpad::AddGpuFingerprintToMicrodumpCrashHandler(gpu_fingerprint);
 }
 
 bool DumpWithoutCrashingToFd(int fd) {
   return g_crash_reporter_client.Pointer()->DumpWithoutCrashingToFd(fd);
 }
 
 bool IsCrashReporterEnabled() {
   return breakpad::IsCrashReporterEnabled();
 }
 
 void SuppressDumpGeneration() {
   breakpad::SuppressDumpGeneration();
 }
 
 }  // namespace crash_reporter
 }  // namespace android_webview