Upload Lacros crashes with /sbin/crash_reporter

Bug: 1163660
Change-Id: I272e8006207b917d8b58b67a783f81c919952c77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622956
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844273}

chrome/browser/chrome_browser_main_linux.cc

@@ -25,9 +25,11 @@
 #include "media/audio/audio_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "chrome/installer/util/google_update_settings.h"
-#else
+#endif
+
+#if !BUILDFLAG(IS_CHROMEOS_ASH)
 #include "base/command_line.h"
 #include "base/linux_util.h"
 #include "chrome/common/chrome_paths_internal.h"
@@ -89,7 +91,7 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() {
     // true all the time isn't useful, we overload the meaning of the breakpad
     // registration metric to mean "is crash reporting enabled", since that's
     // what breakpad registration effectively meant in the days before crashpad.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     breakpad_registered = GoogleUpdateSettings::GetCollectStatsConsent();
 #else
     breakpad_registered = crash_reporter::GetUploadsEnabled();

chrome/browser/crash_upload_list/crash_upload_list.cc

@@ -39,7 +39,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
 // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled,
 // which isn't compatible with CrashUploadListCrashpad. crash_sender continues
 // to log uploads in CrashUploadList::kReporterLogFilename.
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS))
   if (crash_reporter::IsCrashpadEnabled()) {
     return new CrashUploadListCrashpad();
   }

chrome/browser/ui/webui/crashes_ui.cc

@@ -177,7 +177,7 @@ void CrashesDOMHandler::UpdateUI() {
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
 
   bool system_crash_reporter = false;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Chrome OS has a system crash reporter.
   system_crash_reporter = true;
 #endif

components/crash/core/app/crashpad_linux.cc

@@ -121,7 +121,7 @@ base::FilePath PlatformCrashpadInitialization(
     // to ChromeOS's /sbin/crash_reporter which in turn passes the dump to
     // crash_sender which handles the upload.
     std::string url;
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS))
     url = crash_reporter_client->GetUploadUrl();
 #else
     url = std::string();
@@ -157,7 +157,7 @@ base::FilePath PlatformCrashpadInitialization(
     // contain these annotations.
     arguments.push_back("--monitor-self-annotation=ptype=crashpad-handler");
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     arguments.push_back("--use-cros-crash-reporter");
 
     if (crash_reporter_client->IsRunningUnattended()) {