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 02bf9050769e90747df1db096173b2bda5be60c1..054ac118b7fe8e8c57449bfe1ca01eb3850bd3ad 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -131,7 +131,7 @@
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "base/linux_util.h"
-#include "chrome/browser/crash_handler_host_linux.h"
+#include "chrome/browser/crash_handler_host_posix.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
@@ -681,7 +681,7 @@ std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
 
 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     CommandLine* command_line, int child_process_id) {
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
   if (IsCrashReporterEnabled()) {
     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
         child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
@@ -1587,14 +1587,9 @@ 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();
+    ExtensionCrashHandlerHostPosix* crash_handler =
+        ExtensionCrashHandlerHostPosix::GetInstance();
     return crash_handler->GetDeathSignalSocket();
   }
 
@@ -1602,17 +1597,16 @@ int ChromeContentBrowserClient::GetCrashSignalFD(
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   if (process_type == switches::kRendererProcess)
-    return RendererCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return RendererCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPluginProcess)
-    return PluginCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return PluginCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kPpapiPluginProcess)
-    return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
+    return PpapiCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kGpuProcess)
-    return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
-#endif  // defined(OS_ANDROID)
+    return GpuCrashHandlerHostPosix::GetInstance()->GetDeathSignalSocket();
 
   return -1;
 }