Commit 602d681e authored by Joshua Peraza's avatar Joshua Peraza Committed by Commit Bot

Revert "linux: enable crashpad"

This reverts commit 3109a771.

Reason for revert: crbug/1040374

Original change's description:
> linux: enable crashpad
> 
> This change disables Breakpad and enables Crashpad for Chrome_Linux. It
> should not affect other embedders or Chrome_ChromeOS.
> 
> Change-Id: I7017f1c6530fe58235e7ce955051b5b469e75244
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1958693
> Commit-Queue: Joshua Peraza <jperaza@chromium.org>
> Reviewed-by: Ken Rockot <rockot@google.com>
> Cr-Commit-Position: refs/heads/master@{#724394}

TBR=rockot@google.com,jperaza@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I61e3e205b730527133e668b5aeaab6d99ad8fb86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2005059Reviewed-by: default avatarJoshua Peraza <jperaza@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#732527}
parent 2d5b0427
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
#include "headless/public/headless_shell.h" #include "headless/public/headless_shell.h"
#include "ui/gfx/switches.h" #include "ui/gfx/switches.h"
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "components/crash/content/app/crashpad.h"
#endif
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "chrome/app/chrome_main_mac.h" #include "chrome/app/chrome_main_mac.h"
#endif #endif
...@@ -111,13 +107,6 @@ int ChromeMain(int argc, const char** argv) { ...@@ -111,13 +107,6 @@ int ChromeMain(int argc, const char** argv) {
} }
#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// TODO(https://crbug.com/942279): This can be removed when Chrome_ChromeOS
// and other embedders on Chrome OS and Linux are ready to use Crashpad.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
crash_reporter::kEnableCrashpad);
#endif
int rv = content::ContentMain(params); int rv = content::ContentMain(params);
return rv; return rv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment