Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore.

chrome/browser/chrome_browser_main_linux.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_linux.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_service.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
-#if defined(USE_LINUX_BREAKPAD)
 #include <stdlib.h>

[Lei Zhang, 2013/07/15 20:55:35]

Can you integrate lines 15-23 with lines 7-8?

[jam, 2013/07/15 21:15:28]

Done.

 
 #include "base/command_line.h"
 #include "base/linux_util.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/breakpad_linux.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
-#endif  // defined(USE_LINUX_BREAKPAD)
-
 namespace {
 
-#if defined(USE_LINUX_BREAKPAD)
 #if !defined(OS_CHROMEOS)
 void GetLinuxDistroCallback() {
   base::GetLinuxDistro();  // Initialize base::linux_distro if needed.
 }
 #endif
 
 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.
@@ skipping 47 matching lines @@
     // instead.
     if (is_chrome_build && !breakpad_enabled)
       breakpad_enabled = getenv(env_vars::kHeadless) != NULL;
     if (!breakpad_enabled)
       breakpad_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableCrashReporterForTesting);
   }
 
   return breakpad_enabled;
 }
-#endif  // defined(USE_LINUX_BREAKPAD)
 
 }  // namespace
 
 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsPosix(parameters) {
 }
 
 ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
 }
 
 void ChromeBrowserMainPartsLinux::PreProfileInit() {
-#if defined(USE_LINUX_BREAKPAD)
 #if !defined(OS_CHROMEOS)
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.  This happens in PreCreateThreads.
   content::BrowserThread::PostTask(content::BrowserThread::FILE,
                                    FROM_HERE,
                                    base::Bind(&GetLinuxDistroCallback));
 #endif
 
   if (IsCrashReportingEnabled(local_state()))
     InitCrashReporter();
-#endif
 
 #if !defined(OS_CHROMEOS)
   const base::FilePath kDefaultMtabPath("/etc/mtab");
   storage_monitor_.reset(new chrome::StorageMonitorLinux(kDefaultMtabPath));
 #endif
 
   ChromeBrowserMainPartsPosix::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsLinux::PostProfileInit() {
   ChromeBrowserMainPartsPosix::PostProfileInit();
 
-#if defined(USE_LINUX_BREAKPAD)
   g_browser_process->metrics_service()->RecordBreakpadRegistration(
       IsCrashReporterEnabled());
-#else
-  g_browser_process->metrics_service()->RecordBreakpadRegistration(false);
-#endif
 }
 
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 
 #if !defined(OS_CHROMEOS)
   // Delete it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost every
   // single browser_test.
   storage_monitor_.reset();
 #endif
 }