Upstream native crash handling changes for Android.

chrome/browser/chromeos/login/wizard_controller.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/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 31 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"

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

Update this throughout

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

Done.

 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 // A boolean pref of the EULA accepted flag.
 const char kEulaAccepted[] = "EulaAccepted";
 
 // A string pref with initial locale set in VPD or manifest.
@@ skipping 334 matching lines @@
   OnOOBECompleted();
 }
 
 void WizardController::OnEulaAccepted() {
   time_eula_accepted_ = base::Time::Now();
   MarkEulaAccepted();
   bool enabled =
       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();
 #endif
   }
 
   InitiateOOBEUpdate();
 }
 
 void WizardController::OnUpdateErrorCheckingForUpdate() {
@@ skipping 321 matching lines @@
 
 bool WizardController::usage_statistics_reporting() const {
   return usage_statistics_reporting_;
 }
 
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
 }
 
 }  // namespace chromeos