Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/ui/views/download/download_danger_prompt_views.cc

Index: chrome/browser/ui/views/download/download_danger_prompt_views.cc
diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index cb3f6ceefe63571ecde13d3f360119d88c59f225..33cae7c39cda7917863cab969ec9b618cf878413 100644
--- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -27,6 +27,7 @@
 #include "url/gurl.h"
 
 using extensions::ExperienceSamplingEvent;
+using safe_browsing::ClientSafeBrowsingReportRequest;
 
 namespace {
 
@@ -71,6 +72,9 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   void RunDone(Action action);
 
   content::DownloadItem* download_;
+  // If show_context_ is true, this is a download confirmation dialog by
+  // download API, otherwise it is download recovery dialog from a regular
+  // download.
   bool show_context_;

[sky, 2016/06/08 16:12:17]

Would it make more sense to have this be
ClientSafeBrowsingReportRequest::ReportType ?

[Jialiu Lin, 2016/06/08 17:46:29]

Hmm... probably not. Report type does depend on show_context_ , and so does
dialog UI. And show_context_ is actually independent from safe browsing service.

 
Personally, I found this variable name very confusing too, so I added some
comments for future developer to have a better sense of what's going on here.
Anyway, we already have a bug (https://crbug.com/308762) aims to refactor this
file and completely separates download confirmation dialog and download recovery
dialog. After it gets fixed, bool show_context_ should be gone.

   OnDone done_;
 
@@ -330,14 +334,18 @@ void DownloadDangerPromptViews::RunDone(Action action) {
   OnDone done = done_;
   done_.Reset();
   if (download_ != NULL) {
-    // If this download is no longer dangerous, or is already canceled or
+    // If this download is no longer dangerous, is already canceled or
     // completed, don't send any report.
     if (download_->IsDangerous() && !download_->IsDone()) {
       const bool accept = action == DownloadDangerPrompt::ACCEPT;
       RecordDownloadDangerPrompt(accept, *download_);
       if (!download_->GetURL().is_empty() &&
           !download_->GetBrowserContext()->IsOffTheRecord()) {
-        SendSafeBrowsingDownloadRecoveryReport(accept, *download_);
+        ClientSafeBrowsingReportRequest::ReportType report_type
+            = show_context_ ?
+                ClientSafeBrowsingReportRequest::DANGEROUS_DOWNLOAD_BY_API :
+                ClientSafeBrowsingReportRequest::DANGEROUS_DOWNLOAD_RECOVERY;
+        SendSafeBrowsingDownloadReport(report_type, accept, *download_);
       }
     }
     download_->RemoveObserver(this);