Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 70e791fc7305e323fbf5d026da21c3bcc5f6e650..ac034a99f8cb5eac9bc5f17c29f328e1fa225a36 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -119,9 +119,9 @@ |
#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" |
-#include "chrome/app/breakpad_linux.h" |
+#include "chrome/app/breakpad_posix.h" |
#endif |
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
@@ -224,11 +224,11 @@ void AddFirstRunNewTabs(BrowserInit* browser_init, |
} |
} |
-#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)) { |
@@ -508,7 +508,7 @@ void SetSocketReusePolicy(int warmest_socket_trial_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 |
@@ -540,7 +540,7 @@ bool IsCrashReportingEnabled(const PrefService* local_state) { |
#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) { |
@@ -1369,7 +1369,7 @@ 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, |