Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/ui/cocoa/download/download_danger_prompt_impl.cc

 // Copyright 2016 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/strings/utf_string_conversions.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
+#include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using extensions::ExperienceSamplingEvent;
+using safe_browsing::ClientSafeBrowsingReportRequest;
 
 namespace {
 
 // TODO(wittman): Create a native web contents modal dialog implementation of
 // this dialog for non-Views platforms, to support bold formatting of the
 // message lead.
 
 // Implements DownloadDangerPrompt using a TabModalConfirmDialog.
 class DownloadDangerPromptImpl : public DownloadDangerPrompt,
                                  public content::DownloadItem::Observer,
@@ skipping 17 matching lines @@
   base::string16 GetDialogMessage() override;
   base::string16 GetAcceptButtonTitle() override;
   base::string16 GetCancelButtonTitle() override;
   void OnAccepted() override;
   void OnCanceled() override;
   void OnClosed() override;
 
   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_;
   OnDone done_;
 
   std::unique_ptr<ExperienceSamplingEvent> sampling_event_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadDangerPromptImpl);
 };
 
 DownloadDangerPromptImpl::DownloadDangerPromptImpl(
     content::DownloadItem* download,
@@ skipping 173 matching lines @@
   OnDone done = done_;
   done_.Reset();
   if (download_ != NULL) {
     // If this download is no longer dangerous, or 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);
     download_ = NULL;
   }
   if (!done.is_null())
     done.Run(action);
 }
 
 }  // namespace
 
 // static
 DownloadDangerPrompt* DownloadDangerPrompt::Create(
     content::DownloadItem* item,
     content::WebContents* web_contents,
     bool show_context,
     const OnDone& done) {
   DownloadDangerPromptImpl* prompt =
       new DownloadDangerPromptImpl(item, web_contents, show_context, done);
   // |prompt| will be deleted when the dialog is done.
   TabModalConfirmDialog::Create(prompt, web_contents);
   return prompt;
 }