[M73] Set page_url in CSBRR proto sent on APK downloads
Also, add a comment in the proto.
See http://b/123719599 for details.
R=drubery
TBR=vakh@chromium.org
(cherry picked from commit 497d3fb539cfcc55def4f0e83db838853c06d953)
Bug: 907280,927831
Change-Id: Idc690f25bfc3b909eead54c0184184bcf0df8a32
Reviewed-on: https://chromium-review.googlesource.com/c/1450415
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#628425}
Reviewed-on: https://chromium-review.googlesource.com/c/1452756
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#179}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}diff --git a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
index a9e340d..cab0ec9 100644
--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
@@ -259,6 +259,7 @@
report->set_type(
safe_browsing::ClientSafeBrowsingReportRequest::APK_DOWNLOAD);
report->set_url(item->GetOriginalUrl().spec());
+ report->set_page_url(item->GetTabUrl().spec());
// Fill referrer chain.
content::WebContents* web_contents =
diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing/proto/csd.proto
index 2a0fdab..a7216fd7 100644
--- a/components/safe_browsing/proto/csd.proto
+++ b/components/safe_browsing/proto/csd.proto
@@ -1180,7 +1180,12 @@
// URL of the page in the address bar.
optional string url = 1;
+
+ // Must be set if the ReportType is not one of DANGEROUS_DOWNLOAD_RECOVERY,
+ // DANGEROUS_DOWNLOAD_WARNING, DANGEROUS_DOWNLOAD_BY_API,
+ // DANGEROUS_DOWNLOAD_OPENED, URL_PASSWORD_PROTECTION_PHISHING.
optional string page_url = 2;
+
optional string referrer_url = 3;
repeated Resource resources = 4;
