| Index: headless/lib/headless_content_main_delegate.cc
|
| diff --git a/headless/lib/headless_content_main_delegate.cc b/headless/lib/headless_content_main_delegate.cc
|
| index 9428908a6657555fd751c6f28ff32fdd3554a188..067ef27193dd9feb922c84c636bb7d6393778e3e 100644
|
| --- a/headless/lib/headless_content_main_delegate.cc
|
| +++ b/headless/lib/headless_content_main_delegate.cc
|
| @@ -33,10 +33,6 @@
|
| #include "headless/embedded_resource_pak.h"
|
| #endif
|
|
|
| -#if defined(OS_MACOSX)
|
| -#include "components/crash/content/app/crashpad.h"
|
| -#endif
|
| -
|
| namespace headless {
|
| namespace {
|
| // Keep in sync with content/common/content_constants_internal.h.
|
| @@ -163,17 +159,16 @@
|
| g_headless_crash_client.Pointer()->set_crash_dumps_dir(
|
| browser_->options()->crash_dumps_dir);
|
|
|
| -#if defined(HEADLESS_USE_BREAKPAD)
|
| +#if !defined(OS_MACOSX)
|
| if (!browser_->options()->enable_crash_reporter) {
|
| DCHECK(!breakpad::IsCrashReporterEnabled());
|
| return;
|
| }
|
| +#if defined(HEADLESS_USE_BREAKPAD)
|
| if (process_type != switches::kZygoteProcess)
|
| breakpad::InitCrashReporter(process_type);
|
| -#elif defined(OS_MACOSX)
|
| - const bool browser_process = process_type.empty();
|
| - crash_reporter::InitializeCrashpad(browser_process, process_type);
|
| #endif // defined(HEADLESS_USE_BREAKPAD)
|
| +#endif // !defined(OS_MACOSX)
|
| }
|
|
|
| void HeadlessContentMainDelegate::PreSandboxStartup() {
|
| @@ -186,8 +181,10 @@
|
| #else
|
| if (command_line.HasSwitch(switches::kEnableLogging))
|
| InitLogging(command_line);
|
| -#endif // defined(OS_WIN)
|
| +#endif
|
| +#if !defined(OS_MACOSX)
|
| InitCrashReporter(command_line);
|
| +#endif
|
| InitializeResourceBundle();
|
| }
|
|
|
|
|