OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h" | 5 #include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/threading/sequenced_worker_pool.h" | 9 #include "base/threading/sequenced_worker_pool.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "chrome/common/chrome_constants.h" | |
13 #include "components/crash/content/app/crashpad.h" | 12 #include "components/crash/content/app/crashpad.h" |
14 | 13 |
15 namespace { | 14 namespace { |
16 | 15 |
17 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
18 typedef void (*GetCrashReportsPointer)( | 17 typedef void (*GetCrashReportsPointer)( |
19 const crash_reporter::Report** reports, | 18 const crash_reporter::Report** reports, |
20 size_t* report_count); | 19 size_t* report_count); |
21 | 20 |
22 void GetReportsThunk( | 21 void GetReportsThunk( |
23 std::vector<crash_reporter::Report>* reports) { | 22 std::vector<crash_reporter::Report>* reports) { |
24 static GetCrashReportsPointer get_crash_reports = []() { | 23 static GetCrashReportsPointer get_crash_reports = []() { |
25 HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName); | 24 // The crash reporting is handled by chrome_elf.dll which loads early in |
| 25 // the chrome process. |
| 26 HMODULE elf_module = GetModuleHandle(L"chrome_elf.dll"); |
26 return reinterpret_cast<GetCrashReportsPointer>( | 27 return reinterpret_cast<GetCrashReportsPointer>( |
27 exe_module ? GetProcAddress(exe_module, "GetCrashReportsImpl") | 28 elf_module ? GetProcAddress(elf_module, "GetCrashReportsImpl") |
28 : nullptr); | 29 : nullptr); |
29 }(); | 30 }(); |
30 | 31 |
31 if (get_crash_reports) { | 32 if (get_crash_reports) { |
32 const crash_reporter::Report* reports_pointer; | 33 const crash_reporter::Report* reports_pointer; |
33 size_t report_count; | 34 size_t report_count; |
34 get_crash_reports(&reports_pointer, &report_count); | 35 get_crash_reports(&reports_pointer, &report_count); |
35 *reports = std::vector<crash_reporter::Report>( | 36 *reports = std::vector<crash_reporter::Report>( |
36 reports_pointer, reports_pointer + report_count); | 37 reports_pointer, reports_pointer + report_count); |
37 } | 38 } |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 crash_reporter::GetReports(&reports); | 78 crash_reporter::GetReports(&reports); |
78 #endif | 79 #endif |
79 | 80 |
80 for (const crash_reporter::Report& report : reports) { | 81 for (const crash_reporter::Report& report : reports) { |
81 uploads->push_back( | 82 uploads->push_back( |
82 UploadInfo(report.remote_id, base::Time::FromTimeT(report.upload_time), | 83 UploadInfo(report.remote_id, base::Time::FromTimeT(report.upload_time), |
83 report.local_id, base::Time::FromTimeT(report.capture_time), | 84 report.local_id, base::Time::FromTimeT(report.capture_time), |
84 ReportUploadStateToUploadInfoState(report.state))); | 85 ReportUploadStateToUploadInfoState(report.state))); |
85 } | 86 } |
86 } | 87 } |
OLD | NEW |