Upstream native crash handling changes for Android.

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index ffedaf0120e7113a7b307cb7959750f57d6af2e9..0978aa83ffde923372d2e72a975df3c94109db51 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -49,8 +49,8 @@
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(USE_LINUX_BREAKPAD)
-#include "chrome/app/breakpad_linux.h"
+#if defined(USE_POSIX_BREAKPAD)
+#include "chrome/app/breakpad_posix.h"
 #endif
 
 using content::BrowserThread;
@@ -405,7 +405,7 @@ void WizardController::OnEulaAccepted() {
       OptionsUtil::ResolveMetricsReportingEnabled(usage_statistics_reporting_);
   CrosSettings::Get()->SetBoolean(kStatsReportingPref, enabled);
   if (enabled) {
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
     // The crash reporter initialization needs IO to complete.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     InitCrashReporter();