Add more detail to Chrome ELF crash reports

chrome_elf/breakpad.cc

 // Copyright 2014 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.
 
 // This module contains the necessary code to register the Breakpad exception
 // handler. This implementation is based on Chrome's crash reporting code.
 
 #include "chrome_elf/breakpad.h"
 
 #include <sddl.h>
 
 #include "base/macros.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome_elf/chrome_elf_util.h"
 #include "version.h"  // NOLINT
 
 google_breakpad::ExceptionHandler* g_elf_breakpad = NULL;
 
 namespace {
 
 const wchar_t kBreakpadProductName[] = L"Chrome";
 const wchar_t kBreakpadVersionEntry[] = L"ver";
 const wchar_t kBreakpadProdEntry[] = L"prod";
 const wchar_t kBreakpadPlatformEntry[] = L"plat";
 const wchar_t kBreakpadPlatformWin32[] = L"Win32";
+const wchar_t kBreakpadProcessEntry[] = L"ptype";
+const wchar_t kBreakpadChannelEntry[] = L"channel";
 
 // The protocol for connecting to the out-of-process Breakpad crash
 // reporter is different for x86-32 and x86-64: the message sizes
 // are different because the message struct contains a pointer.  As
 // a result, there are two different named pipes to connect to.  The
 // 64-bit one is distinguished with an "-x64" suffix.
 const wchar_t kChromePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices\\";
 const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\";
 const wchar_t kSystemPrincipalSid[] = L"S-1-5-18";
 
 const wchar_t kNoErrorDialogs[] = L"noerrdialogs";
 const wchar_t kChromeHeadless[] = L"CHROME_HEADLESS";
 
 google_breakpad::CustomClientInfo* GetCustomInfo() {
+  base::string16 process = IsNonBrowserProcess() ? L"renderer" : L"browser";
+
+  wchar_t exe_path[MAX_PATH] = {};
+  base::string16 channel;
+  if (GetModuleFileName(NULL, exe_path, arraysize(exe_path)) &&
+      IsCanary(exe_path)) {
+    channel = L"canary";
+  }
+
   static google_breakpad::CustomInfoEntry ver_entry(
       kBreakpadVersionEntry, TEXT(CHROME_VERSION_STRING));
   static google_breakpad::CustomInfoEntry prod_entry(
       kBreakpadProdEntry, kBreakpadProductName);
   static google_breakpad::CustomInfoEntry plat_entry(
       kBreakpadPlatformEntry, kBreakpadPlatformWin32);
+  static google_breakpad::CustomInfoEntry proc_entry(
+      kBreakpadProcessEntry, process.c_str());
+  static google_breakpad::CustomInfoEntry channel_entry(
+      kBreakpadChannelEntry, channel.c_str());
   static google_breakpad::CustomInfoEntry entries[] = {
-      ver_entry, prod_entry, plat_entry  };
+      ver_entry, prod_entry, plat_entry, proc_entry, channel_entry};
   static google_breakpad::CustomClientInfo custom_info = {
       entries, arraysize(entries) };
   return &custom_info;
 }
 
 base::string16 GetUserSidString() {
   // Get the current token.
   HANDLE token = NULL;
   base::string16 user_sid;
   if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY, &token))
@@ skipping 111 matching lines @@
       google_breakpad::ExceptionHandler::HANDLER_ALL,
       dump_type,
       pipe_name.c_str(),
       GetCustomInfo());
 
   if (g_elf_breakpad->IsOutOfProcess()) {
     // Tells breakpad to handle breakpoint and single step exceptions.
     g_elf_breakpad->set_handle_debug_exceptions(true);
   }
 }