Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/download/download_danger_prompt.cc

 // Copyright (c) 2012 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/download/download_danger_prompt.h"
 
 #include "base/macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/file_type_policies.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 
 using safe_browsing::ClientDownloadResponse;
 using safe_browsing::ClientSafeBrowsingReportRequest;
 
 namespace {
 
 const char kDownloadDangerPromptPrefix[] = "Download.DownloadDangerPrompt";
@@ skipping 19 matching lines @@
     case content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
     case content::DOWNLOAD_DANGER_TYPE_MAX:
       break;
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace
 
-void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
+void DownloadDangerPrompt::SendSafeBrowsingDownloadReport(
+    ClientSafeBrowsingReportRequest::ReportType report_type,
     bool did_proceed,
     const content::DownloadItem& download) {
   safe_browsing::SafeBrowsingService* sb_service =
       g_browser_process->safe_browsing_service();
   ClientSafeBrowsingReportRequest report;
-  report.set_type(ClientSafeBrowsingReportRequest::DANGEROUS_DOWNLOAD_RECOVERY);
+  report.set_type(report_type);
   switch (download.GetDangerType()) {
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
       report.set_download_verdict(ClientDownloadResponse::DANGEROUS);
       break;
     case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
       report.set_download_verdict(ClientDownloadResponse::UNCOMMON);
       break;
     case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
       report.set_download_verdict(ClientDownloadResponse::POTENTIALLY_UNWANTED);
       break;
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
       report.set_download_verdict(ClientDownloadResponse::DANGEROUS_HOST);
       break;
     default:  // Don't send report for any other danger types.
       return;
   }
   report.set_url(download.GetURL().spec());
   report.set_did_proceed(did_proceed);
+  std::string token = download.GetDownloadPingToken();
+  if (!token.empty())
+    report.set_token(token);
 
   std::string serialized_report;
   if (report.SerializeToString(&serialized_report))
     sb_service->SendSerializedDownloadReport(serialized_report);
   else
     DLOG(ERROR) << "Unable to serialize the threat report.";
 }
 
 void DownloadDangerPrompt::RecordDownloadDangerPrompt(
     bool did_proceed,
     const content::DownloadItem& download) {
   int64_t file_type_uma_value =
       safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile(
           download.GetTargetFilePath());
   content::DownloadDangerType danger_type = download.GetDangerType();
 
   UMA_HISTOGRAM_SPARSE_SLOWLY(
       base::StringPrintf("%s.%s.Shown", kDownloadDangerPromptPrefix,
                          GetDangerTypeString(danger_type)),
       file_type_uma_value);
   if (did_proceed) {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         base::StringPrintf("%s.%s.Proceed", kDownloadDangerPromptPrefix,
                            GetDangerTypeString(danger_type)),
         file_type_uma_value);
   }
 }