Chromium Code Reviews| Index: components/crash/content/app/crashpad.cc |
| diff --git a/components/crash/content/app/crashpad.cc b/components/crash/content/app/crashpad.cc |
| index 1c0c49936dddb46e5645116276923c81215fb11b..495a086134599282a76ebd085dab2041f59ea7f5 100644 |
| --- a/components/crash/content/app/crashpad.cc |
| +++ b/components/crash/content/app/crashpad.cc |
| @@ -269,8 +269,8 @@ bool GetUploadsEnabled() { |
| return false; |
| } |
| -void GetUploadedReports(std::vector<UploadedReport>* uploaded_reports) { |
| - uploaded_reports->clear(); |
| +void GetReports(std::vector<Report>* reports) { |
| + reports->clear(); |
| if (!g_database) { |
| return; |
| @@ -283,20 +283,34 @@ void GetUploadedReports(std::vector<UploadedReport>* uploaded_reports) { |
| return; |
| } |
| + std::vector<crashpad::CrashReportDatabase::Report> pending_reports; |
| + status = g_database->GetPendingReports(&pending_reports); |
|
Mark Mentovai
2016/06/20 17:55:21
This is fine right now, but we may want to add an
scottmg
2016/06/20 21:08:55
Yup, good point.
|
| + if (status != crashpad::CrashReportDatabase::kNoError) { |
| + return; |
| + } |
| + |
| for (const crashpad::CrashReportDatabase::Report& completed_report : |
| completed_reports) { |
| - if (completed_report.uploaded) { |
| - UploadedReport uploaded_report; |
| - uploaded_report.local_id = completed_report.uuid.ToString(); |
| - uploaded_report.remote_id = completed_report.id; |
| - uploaded_report.creation_time = completed_report.creation_time; |
| + Report report; |
| + report.local_id = completed_report.uuid.ToString(); |
| + report.remote_id = completed_report.id; |
| + report.creation_time = completed_report.creation_time; |
| + report.state = completed_report.uploaded ? ReportUploadState::Uploaded |
| + : ReportUploadState::NotUploaded; |
| + reports->push_back(report); |
| + } |
| - uploaded_reports->push_back(uploaded_report); |
| - } |
| + for (const crashpad::CrashReportDatabase::Report& pending_report : |
| + pending_reports) { |
| + Report report; |
| + report.local_id = pending_report.uuid.ToString(); |
| + report.creation_time = pending_report.creation_time; |
| + report.state = ReportUploadState::Pending; |
| + reports->push_back(report); |
| } |
| - std::sort(uploaded_reports->begin(), uploaded_reports->end(), |
| - [](const UploadedReport& a, const UploadedReport& b) { |
| + std::sort(reports->begin(), reports->end(), |
| + [](const Report& a, const Report& b) { |
| return a.creation_time > b.creation_time; |
| }); |
| } |