Upstream native crash handling changes for Android.

chrome/common/logging_chrome.h

 // 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.
 
 #ifndef CHROME_COMMON_LOGGING_CHROME_H__
 #define CHROME_COMMON_LOGGING_CHROME_H__
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 47 matching lines @@
 // NOTE: Since this reads the log file to determine the assertions,
 // this operation is O(n) over the length of the log.
 // NOTE: This can fail if the file is locked for writing.  However,
 // this is unlikely as this function is most useful after
 // the program writing the log has terminated.
 size_t GetFatalAssertions(AssertionList* assertions);
 
 // Handler to silently dump the current process without crashing.
 void DumpWithoutCrashing();
 
-#if defined(USE_LINUX_BREAKPAD) || defined(OS_MACOSX)
+#if defined(USE_POSIX_BREAKPAD) || defined(OS_MACOSX)
 // Sets a function that'll be invoked to dump the current process when
 // DumpWithoutCrashing() is called.
 void SetDumpWithoutCrashingFunction(void (*function)());
 #endif
 
 }  // namespace logging
 
 #endif  // CHROME_COMMON_LOGGING_CHROME_H_