Manual crash uploads for mac and win

chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h"
 
 #include <stddef.h>
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/crash/content/app/crashpad.h"
 
 namespace {
 
 #if defined(OS_WIN)
+// The name of the function used for requesting a single crash upload from
+// components/crash/content/app/crashpad.cc. Called through chrome_elf dll.
+const char kRequestSingleCrashUploadFunc[] = "RequestSingleCrashUploadImpl";
+
 typedef void (*GetCrashReportsPointer)(
     const crash_reporter::Report** reports,
     size_t* report_count);
 
 void GetReportsThunk(
     std::vector<crash_reporter::Report>* reports) {
   static GetCrashReportsPointer get_crash_reports = []() {
     // The crash reporting is handled by chrome_elf.dll which loads early in
     // the chrome process.
     HMODULE elf_module = GetModuleHandle(chrome::kChromeElfDllName);
     return reinterpret_cast<GetCrashReportsPointer>(
         elf_module ? GetProcAddress(elf_module, "GetCrashReportsImpl")
                    : nullptr);
   }();
 
   if (get_crash_reports) {
     const crash_reporter::Report* reports_pointer;
     size_t report_count;
     get_crash_reports(&reports_pointer, &report_count);
     *reports = std::vector<crash_reporter::Report>(
         reports_pointer, reports_pointer + report_count);
   }
 }
+
+void RequestSingleCrashUploadThunk(const std::string& local_id) {

[Mark Mentovai, 2016/08/25 20:25:11]

This whole function should probably just follow the model of GetReportsThunk()
above.

[gayane -on leave until 09-2017, 2016/08/26 00:12:54]

Done.

+  // The crash reporting is handled by chrome_elf.dll which loads early in
+  // the chrome process.
+  HMODULE elf_module = GetModuleHandle(chrome::kChromeElfDllName);
+  if (elf_module) {
+    static RequestSingleCrashUploadPointer request_single_crash_upload =

[Mark Mentovai, 2016/08/25 20:25:11]

This type wasn’t ever declared.

[gayane -on leave until 09-2017, 2016/08/26 00:12:54]

Done.

+        reinterpret_cast<RequestSingleCrashUploadPointer>(
+            GetProcAddress(elf_module, kRequestSingleCrashUploadFunc);

[Mark Mentovai, 2016/08/25 20:25:11]

No reason for this to be a constant as opposed to just writing it inline here.

[gayane -on leave until 09-2017, 2016/08/26 00:12:54]

Done.

+
+    if (request_single_crash_upload)
+      request_single_crash_upload(local_id);
+  }
+}
+
 #endif  // OS_WIN
 
 UploadList::UploadInfo::State ReportUploadStateToUploadInfoState(
     crash_reporter::ReportUploadState state) {
   switch (state) {
     case crash_reporter::ReportUploadState::NotUploaded:
       return UploadList::UploadInfo::State::NotUploaded;
 
     case crash_reporter::ReportUploadState::Pending:
       return UploadList::UploadInfo::State::Pending;
 
     case crash_reporter::ReportUploadState::Uploaded:
       return UploadList::UploadInfo::State::Uploaded;
+
+    case crash_reporter::ReportUploadState::UserRequested:
+      return UploadList::UploadInfo::State::UserRequested;
   }
 
   NOTREACHED();
   return UploadList::UploadInfo::State::Uploaded;
 }
 
 }  // namespace
 
 CrashUploadListCrashpad::CrashUploadListCrashpad(
     Delegate* delegate,
@@ skipping 15 matching lines @@
   crash_reporter::GetReports(&reports);
 #endif
 
   for (const crash_reporter::Report& report : reports) {
     uploads->push_back(
         UploadInfo(report.remote_id, base::Time::FromTimeT(report.upload_time),
                    report.local_id, base::Time::FromTimeT(report.capture_time),
                    ReportUploadStateToUploadInfoState(report.state)));
   }
 }
+
+void CrashUploadListCrashpad::RequestSingleCrashUpload(
+    const std::string& local_id) {
+#if defined(OS_WIN)
+  // On Windows, crash reporting is handled by chrome_elf.dll, thats why we
+  // can't call crash_reporter::RequestSingleCrashUpload directly.
+  RequestSingleCrashUploadThunk(local_id);
+#else
+  crash_reporter::RequestSingleCrashUpload(local_id);
+#endif
+}