Upstream native crash handling changes for Android.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index d6c855772b51a9a596e6631bf2c4528f867bad79..b11823eac79efe2a2f98adc0e2651f07f610b49e 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -135,9 +135,9 @@
 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
 #endif
 
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
 #include "base/linux_util.h"
-#include "chrome/browser/crash_handler_host_linux.h"
+#include "chrome/browser/crash_handler_host_linuxish.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
@@ -1611,11 +1611,6 @@ bool ChromeContentBrowserClient::AllowSocketAPI(
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 int ChromeContentBrowserClient::GetCrashSignalFD(
     const CommandLine& command_line) {
-#if defined(OS_ANDROID)
-  // TODO(carlosvaldivia): Upstream breakpad code for Android and remove this
-  // fork. http://crbug.com/113560
-  NOTIMPLEMENTED();
-#else
   if (command_line.HasSwitch(switches::kExtensionProcess)) {
     ExtensionCrashHandlerHostLinux* crash_handler =
         ExtensionCrashHandlerHostLinux::GetInstance();
@@ -1636,7 +1631,6 @@ int ChromeContentBrowserClient::GetCrashSignalFD(
 
   if (process_type == switches::kGpuProcess)
     return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
-#endif  // defined(OS_ANDROID)
 
   return -1;
 }