Grab more fallback crash detail on canary/dev.

components/crash/content/app/fallback_crash_handler_win.cc

 // Copyright 2017 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 "components/crash/content/app/fallback_crash_handler_win.h"
 
 #include <dbghelp.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 374 matching lines @@
   crashpad::CrashReportDatabase::NewReport* report = nullptr;
   crashpad::CrashReportDatabase::OperationStatus status =
       database->PrepareNewCrashReport(&report);
   if (status != crashpad::CrashReportDatabase::kNoError)
     return false;
 
   // Make sure we release the report on early exit.
   crashpad::CrashReportDatabase::CallErrorWritingCrashReport on_error(
       database.get(), report);
 
-  // TODO(siggi): Go big on the detail here for Canary/Dev channels.
-  const uint32_t kMinidumpType = MiniDumpWithUnloadedModules |
-                                 MiniDumpWithProcessThreadData |
-                                 MiniDumpWithThreadInfo;
-
   MINIDUMP_EXCEPTION_INFORMATION exc_info = {};
   exc_info.ThreadId = thread_id_;
   exc_info.ExceptionPointers =
       reinterpret_cast<EXCEPTION_POINTERS*>(exception_ptrs_);
   exc_info.ClientPointers = TRUE;  // ExceptionPointers in client.
 
 // Mandatory crash keys. These will be read by Crashpad and used as
 // http request parameters for the upload. Keys and values need to match
 // server side configuration.
 #if defined(ARCH_CPU_64_BITS)
@@ skipping 21 matching lines @@
 
   // Open the file with delete on close, to try and ensure it's cleaned up on
   // any kind of failure.
   base::File dump_file(dump_file_path, base::File::FLAG_OPEN |
                                            base::File::FLAG_READ |
                                            base::File::FLAG_WRITE |
                                            base::File::FLAG_DELETE_ON_CLOSE);
   if (!dump_file.IsValid())
     return false;
 
+  uint32_t minidump_type = MiniDumpWithUnloadedModules |
+                                 MiniDumpWithProcessThreadData |
+                                 MiniDumpWithThreadInfo;
+
+  // Capture more detail for canary and dev channels. The prefix search caters
+  // for the soon to be outdated "-m" suffixed multi-install channels.
+  if (channel.find("canary") == 0 || channel.find("dev") == 0)
+    minidump_type |= MiniDumpWithIndirectlyReferencedMemory;
+
+

[scottmg, 2017/01/17 17:39:48]

Extra \n here.

[Sigurður Ásgeirsson, 2017/01/17 17:53:19]

Done.

   // Write the minidump to the temp file, and then copy the data to the
   // Crashpad-provided handle, as the latter is only open for write.
-  if (!MiniDumpWriteDumpWithCrashpadInfo(process_, kMinidumpType, &exc_info,
+  if (!MiniDumpWriteDumpWithCrashpadInfo(process_, minidump_type, &exc_info,
                                          crash_keys, client_id, report->uuid,
                                          &dump_file) ||
       !AppendFileContents(&dump_file, report->handle)) {
     return false;
   }
 
   on_error.Disarm();
 
   crashpad::UUID report_id = {};
   status = database->FinishedWritingCrashReport(report, &report_id);
   if (status != crashpad::CrashReportDatabase::kNoError)
     return false;
 
   return true;
 }
 
 }  // namespace crash_reporter