Upstream native crash handling changes for Android.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 101 matching lines @@
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_throttler_manager.h"
 #include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
 #include "base/linux_util.h"

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

Should this be moved too?

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

How about in the future? I'm afraid that this cl is already becoming bloated
with re-names.

On 2012/04/03 23:54:20, Yaron wrote:

 #include "chrome/app/breakpad_linux.h"

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

posix

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

Done.

 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "chrome/browser/first_run/upgrade_util_linux.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
@@ skipping 82 matching lines @@
 
 void AddFirstRunNewTabs(BrowserInit* browser_init,
                         const std::vector<GURL>& new_tabs) {
   for (std::vector<GURL>::const_iterator it = new_tabs.begin();
        it != new_tabs.end(); ++it) {
     if (it->is_valid())
       browser_init->AddFirstRunTab(*it);
   }
 }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
 void GetLinuxDistroCallback() {
   base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
 }
-#endif  // USE_LINUX_BREAKPAD
+#endif  // USE_POSIX_BREAKPAD
 
 void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kEnableFileCookies)) {
     // Enable cookie storage for file:// URLs.  Must do this before the first
     // Profile (and therefore the first CookieMonster) is created.
     net::CookieMonster::EnableFileScheme();
   }
 
   if (parsed_command_line.HasSwitch(switches::kIgnoreCertificateErrors))
     net::HttpStreamFactory::set_ignore_certificate_errors(true);
@@ skipping 259 matching lines @@
 void SetSocketReusePolicy(int warmest_socket_trial_group,
                           const int socket_policy[],
                           int num_groups) {
   const int* result = std::find(socket_policy, socket_policy + num_groups,
                                 warmest_socket_trial_group);
   DCHECK_NE(result, socket_policy + num_groups)
       << "Not a valid socket reuse policy group";
   net::SetSocketReusePolicy(result - socket_policy);
 }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
 bool IsCrashReportingEnabled(const PrefService* local_state) {
   // Check whether we should initialize the crash reporter. It may be disabled
   // through configuration policy or user preference. It must be disabled for
   // Guest mode on Chrome OS in Stable channel.
   // The kHeadless environment variable overrides the decision, but only if the
   // crash service is under control of the user. It is used by QA testing
   // infrastructure to switch on generation of crash reports.
 #if defined(OS_CHROMEOS)
   bool is_guest_session =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
@@ skipping 11 matching lines @@
   const PrefService::Preference* metrics_reporting_enabled =
       local_state->FindPreference(prefs::kMetricsReportingEnabled);
   CHECK(metrics_reporting_enabled);
   bool breakpad_enabled =
       local_state->GetBoolean(prefs::kMetricsReportingEnabled);
   if (!breakpad_enabled && metrics_reporting_enabled->IsUserModifiable())
     breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
 #endif  // #if defined(OS_CHROMEOS)
   return breakpad_enabled;
 }
-#endif  // #if defined(USE_LINUX_BREAKPAD)
+#endif  // #if defined(USE_POSIX_BREAKPAD)
 
 // This code is specific to the Windows-only PreReadExperiment field-trial.
 void AddPreReadHistogramTime(const char* name, base::TimeDelta time) {
   const base::TimeDelta kMin(base::TimeDelta::FromMilliseconds(1));
   const base::TimeDelta kMax(base::TimeDelta::FromHours(1));
   static const size_t kBuckets(100);
 
   // FactoryTimeGet will always return a pointer to the same histogram object,
   // keyed on its name. There's no need for us to store it explicitly anywhere.
   base::Histogram* counter = base::Histogram::FactoryTimeGet(
@@ skipping 808 matching lines @@
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostBrowserStart();
   // Allow ProcessSingleton to process messages.
   process_singleton_->Unlock();
 }
 
 int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // Now that the file thread has been started, start recording.
   StartMetricsRecording();
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(USE_POSIX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.  This happens in PreCreateThreads.
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&GetLinuxDistroCallback));
 
   if (IsCrashReportingEnabled(local_state_))
     InitCrashReporter();
 #endif
 
@@ skipping 560 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }