Commit e9922eb6 authored by Joshua Peraza's avatar Joshua Peraza Committed by Commit Bot

chromeos: don't use CrashUploadListCrashpad

CrashUploadListCrashpad is meant to be used with a Crashpad report
database, but ChromeOS still uses its own report storage and upload
tools.

Bug: 942279
Change-Id: I805c8ca90491e926207275253d1b4d134e8b1a47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1822719Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699501}
parent 5c603093
...@@ -34,9 +34,16 @@ scoped_refptr<UploadList> CreateCrashUploadList() { ...@@ -34,9 +34,16 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
.AppendASCII(CrashUploadList::kReporterLogFilename); .AppendASCII(CrashUploadList::kReporterLogFilename);
return new CrashUploadListAndroid(upload_log_path); return new CrashUploadListAndroid(upload_log_path);
#else #else
// 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 !defined(OS_CHROMEOS)
if (crash_reporter::IsCrashpadEnabled()) { if (crash_reporter::IsCrashpadEnabled()) {
return new CrashUploadListCrashpad(); return new CrashUploadListCrashpad();
} }
#endif
base::FilePath crash_dir_path; base::FilePath crash_dir_path;
base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path); base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
base::FilePath upload_log_path = base::FilePath upload_log_path =
......
...@@ -175,7 +175,9 @@ void CrashesDOMHandler::UpdateUI() { ...@@ -175,7 +175,9 @@ void CrashesDOMHandler::UpdateUI() {
bool using_crashpad = false; bool using_crashpad = false;
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
using_crashpad = true; using_crashpad = true;
#elif defined(OS_LINUX) #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
// ChromeOS uses crash_sender instead of Crashpad for uploads even when
// Crashpad is enabled for dump generation.
using_crashpad = crash_reporter::IsCrashpadEnabled(); using_crashpad = crash_reporter::IsCrashpadEnabled();
#endif #endif
......
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