Upstream crash changes for android.

chrome/browser/crash_handler_host_linuxish.cc

Index: chrome/browser/crash_handler_host_linuxish.cc
diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linuxish.cc
similarity index 98%
rename from chrome/browser/crash_handler_host_linux.cc
rename to chrome/browser/crash_handler_host_linuxish.cc
index c3854061d482d603ce46199f9c7901431e98109b..8b393fe77d77acdb25c40e5a7cd74807410b7c5d 100644
--- a/chrome/browser/crash_handler_host_linux.cc
+++ b/chrome/browser/crash_handler_host_linuxish.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/crash_handler_host_linux.h"
+#include "chrome/browser/crash_handler_host_linuxish.h"
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -27,11 +27,17 @@
 #include "breakpad/src/client/linux/handler/exception_handler.h"
 #include "breakpad/src/client/linux/minidump_writer/linux_dumper.h"
 #include "breakpad/src/client/linux/minidump_writer/minidump_writer.h"
-#include "chrome/app/breakpad_linux.h"
+#include "chrome/app/breakpad_linuxish.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/env_vars.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_ANDROID)
+#include <sys/linux-syscalls.h>
+
+#define SYS_read __NR_read
+#endif
+
 using content::BrowserThread;
 using google_breakpad::ExceptionHandler;
 
@@ -318,8 +324,12 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) {
 
   info->distro_length = strlen(distro);
   info->distro = distro;
-
+#if defined(OS_ANDROID)
+  // Nothing gets uploaded in android.
+  info->upload = false;
+#else
   info->upload = (getenv(env_vars::kHeadless) == NULL);
+#endif
   info->process_start_time = uptime;
   info->oom_size = oom_size;
 
@@ -361,6 +371,7 @@ void CrashHandlerHostLinux::WriteDumpFile(BreakpadInfo* info,
   minidump_filename.copy(minidump_filename_str, minidump_filename.length());
   minidump_filename_str[minidump_filename.length()] = '\0';
   info->filename = minidump_filename_str;
+  info->pid = crashing_pid;
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,