Upstream native crash handling changes for Android.

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index f689512dbc8ada5a69d8381b65452cfb01586775..ae8737c2d15626c0fa1cbbe8a2d62807e4ea9d97 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -88,8 +88,8 @@
 #include "ui/base/x/x11_util.h"
 #endif
 
-#if defined(USE_LINUX_BREAKPAD)
-#include "chrome/app/breakpad_linux.h"
+#if defined(USE_POSIX_BREAKPAD)
+#include "chrome/app/breakpad_posix.h"
 #endif
 
 base::LazyInstance<chrome::ChromeContentBrowserClient>
@@ -637,7 +637,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #endif  // defined(OS_MACOSX)
   }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain
   // sets this up for the browser process in a different manner. Zygotes
   // need to call InitCrashReporter() in RunZygote().
@@ -734,7 +734,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   InitCrashReporter();