Upstream native crash handling changes for Android.

chrome/common/logging_chrome.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
@@ skipping 57 matching lines @@
 // InitChromeLogging() and the beginning of CleanupChromeLogging().
 bool chrome_logging_redirected_ = false;
 
 #if defined(OS_WIN)
 // {7FE69228-633E-4f06-80C1-527FEA23E3A7}
 const GUID kChromeTraceProviderName = {
     0x7fe69228, 0x633e, 0x4f06,
         { 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;
 #endif
 
 // Assertion handler for logging errors that occur when dialogs are
 // silenced.  To record a new error, pass the log string associated
 // with that error in the str parameter.
 MSVC_DISABLE_OPTIMIZE();
 void SilentRuntimeAssertHandler(const std::string& str) {
@@ skipping 362 matching lines @@
   }
   log_file.close();
 
   return assertion_count;
 }
 
 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
   NOTIMPLEMENTED();
 #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;
 }
 #endif
 
 }  // namespace logging