Upstream native crash handling changes for Android.

chrome/common/logging_chrome.cc

Index: chrome/common/logging_chrome.cc
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 6dfab8369e66c6d68230fca263723a7f01b9a168..2fbd53fa36aea010c39c8730e3adc976082586a3 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -75,7 +75,7 @@ const GUID kChromeTraceProviderName = {
         { 0x80, 0xc1, 0x52, 0x7f, 0xea, 0x23, 0xe3, 0xa7 } };
 #endif
 
-#if defined(USE_LINUX_BREAKPAD) || defined(OS_MACOSX)
+#if defined(USE_POSIX_BREAKPAD) || defined(OS_MACOSX)
 // Pointer to the function that's called by DumpWithoutCrashing() to dump the
 // process's memory.
 void (*dump_without_crashing_function_)() = NULL;
@@ -458,7 +458,7 @@ void DumpWithoutCrashing() {
 #if defined(OS_WIN)
   std::string str;
   DumpProcessAssertHandler(str);
-#elif defined(USE_LINUX_BREAKPAD) || defined(OS_MACOSX)
+#elif defined(USE_POSIX_BREAKPAD) || defined(OS_MACOSX)
   if (dump_without_crashing_function_)
     (*dump_without_crashing_function_)();
 #else
@@ -466,7 +466,7 @@ void DumpWithoutCrashing() {
 #endif
 }
 
-#if defined(USE_LINUX_BREAKPAD) || defined(OS_MACOSX)
+#if defined(USE_POSIX_BREAKPAD) || defined(OS_MACOSX)
 void SetDumpWithoutCrashingFunction(void (*function)()) {
   dump_without_crashing_function_ = function;
 }