Upstream native crash handling changes for Android.

chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 70 matching lines @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #endif
 
 #if defined(USE_X11)
 #include <stdlib.h>
 #include <string.h>
 #include "ui/base/x/x11_util.h"
 #endif
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"

[Yaron, 2012/04/03 23:54:20]

breakpad_posix

[carlosvaldivia, 2012/04/04 20:52:34]

Done.

 #endif
 
 base::LazyInstance<chrome::ChromeContentBrowserClient>
     g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<chrome::ChromeContentRendererClient>
     g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<chrome::ChromeContentUtilityClient>
     g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<chrome::ChromeContentPluginClient>
     g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
@@ skipping 527 matching lines @@
     CHECK(!loaded_locale.empty()) << "Locale could not be found for " <<
         locale;
 
 #if defined(OS_MACOSX)
     // Update the process name (need resources to get the strings, so
     // only do this when ResourcesBundle has been initialized).
     SetMacProcessName(command_line);
 #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().
   if (!process_type.empty() && process_type != switches::kZygoteProcess)
     InitCrashReporter();
 #endif
 
 #if defined(OS_CHROMEOS)
   // Read and cache ChromeOS version from file,
   // to be used from inside the sandbox.
@@ skipping 76 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   Profiling::ProcessStarted();
   if (Profiling::BeingProfiled()) {
     base::debug::RestartProfilingAfterFork();
     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();
 #endif
 
   InitializeChromeContentClient(process_type);
 }
 #endif  // OS_MACOSX