Upstream native crash handling changes for Android.

chrome/common/logging_chrome_uitest.cc

Index: chrome/common/logging_chrome_uitest.cc
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 8c87ff49a0e711d5e59bfe8274e3277c8fd71e1f..551fbd9428624e13e2a9b8605c7d637b6bbc60bc 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -66,7 +66,8 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
   RestoreEnvironmentVariable();
 }
 
-#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) \
+    && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
 // On Linux in Debug mode, Chrome generates a SIGTRAP.
 // we do not catch SIGTRAPs, thus no crash dump.
 // This also does not work if Breakpad is disabled.
@@ -149,7 +150,7 @@ class RendererCrashTest : public UITest {
   }
 };
 
-#if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD)
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) && !defined(USE_LINUX_BREAKPAD)
 // On Linux, do not expect a crash dump if Breakpad is disabled.
 #define EXPECTED_CRASH_CRASHES 0
 #else