Commit 7c8f8822 authored by Anqing Zhao's avatar Anqing Zhao Committed by Commit Bot

Support ChromeOsUserReport in ReportScheduler for Chrome OS

Previously, ReportScheduler is designed for ChromeDesktopReportRequest
on Windows, Mac and Linux. To supporting Chrome OS, now change the
specific request to the macro defined in ReportGenerator.

The test cases in report_scheduler_unittest.cc will change report type
according to current os environment.
- Chrome OS: ChromeOsUserReportRequest
- Others: ChromeDesktopReportRequest

Change-Id: Ic105ec09012ce57c913c214825a83b67cfb14caf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1908546
Commit-Queue: Anqing Zhao <anqing@google.com>
Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715081}
parent cf0da341
......@@ -79,7 +79,7 @@ class FakeRequestTimer : public RequestTimer {
ACTION_P(ScheduleGeneratorCallback, request_number) {
ReportGenerator::Requests requests;
for (int i = 0; i < request_number; i++)
requests.push(std::make_unique<em::ChromeDesktopReportRequest>());
requests.push(std::make_unique<ReportGenerator::Request>());
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(arg0), std::move(requests)));
}
......@@ -170,7 +170,7 @@ class ReportSchedulerTest : public ::testing::Test {
ReportGenerator::Requests CreateRequests(int number) {
ReportGenerator::Requests requests;
for (int i = 0; i < number; i++)
requests.push(std::make_unique<em::ChromeDesktopReportRequest>());
requests.push(std::make_unique<ReportGenerator::Request>());
return requests;
}
......
......@@ -3708,6 +3708,7 @@ test("unit_tests") {
"../browser/enterprise_reporting/profile_report_generator_unittest.cc",
"../browser/enterprise_reporting/report_generator_unittest.cc",
"../browser/enterprise_reporting/report_request_queue_generator_unittest.cc",
"../browser/enterprise_reporting/report_scheduler_unittest.cc",
"../browser/enterprise_reporting/report_uploader_unittest.cc",
"../browser/enterprise_reporting/request_timer_unittest.cc",
"../browser/first_run/first_run_unittest.cc",
......@@ -3996,13 +3997,6 @@ test("unit_tests") {
if (is_mac) {
deps += [ ":firefox_importer_interface" ]
}
# TODO(anqing): finally these two set of unit test will be suitable to
# other platforms, rather than Chrome OS only.
if (!is_chromeos) {
sources +=
[ "../browser/enterprise_reporting/report_scheduler_unittest.cc" ]
}
}
if (!is_android) {
......
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