Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/download/download_browsertest.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_browsertest.h"
 
 #include <stdint.h>
 #include <sstream>
 #include <utility>
 
@@ skipping 109 matching lines @@
 using content::DownloadManager;
 using content::DownloadUrlParameters;
 using content::WebContents;
 using extensions::Extension;
 using extensions::FeatureSwitch;
 using net::URLRequestMockHTTPJob;
 
 namespace {
 
 const char kDownloadTest1Path[] = "download-test1.lib";
+const char kDownloadResponseToken[] = "download_token";
 
 class CreatedObserver : public content::DownloadManager::Observer {
  public:
   explicit CreatedObserver(content::DownloadManager* manager)
       : manager_(manager),
         waiting_(false) {
     manager->AddObserver(this);
   }
   ~CreatedObserver() override {
     if (manager_)
@@ skipping 936 matching lines @@
 
 namespace {
 
 class FakeDownloadProtectionService
     : public safe_browsing::DownloadProtectionService {
  public:
   FakeDownloadProtectionService()
       : safe_browsing::DownloadProtectionService(nullptr) {}
 
   void CheckClientDownload(DownloadItem* download_item,
-      const CheckDownloadCallback& callback) override {
+      const CheckDownloadContentCallback& callback) override {
     callback.Run(
-      safe_browsing::DownloadProtectionService::UNCOMMON);
+      safe_browsing::DownloadProtectionService::UNCOMMON,
+      kDownloadResponseToken);
   }
 };
 
 class FakeSafeBrowsingService
     : public safe_browsing::TestSafeBrowsingService,
       public safe_browsing::ServicesDelegate::ServicesCreator {
  public:
   FakeSafeBrowsingService() {
     services_delegate_ =
         safe_browsing::ServicesDelegate::CreateForTest(this, this);
@@ skipping 2281 matching lines @@
   actual_report.ParseFromString(
       test_safe_browsing_factory_->fake_safe_browsing_service()
           ->serilized_download_report());
   EXPECT_EQ(safe_browsing::ClientSafeBrowsingReportRequest::
                 DANGEROUS_DOWNLOAD_WARNING,
             actual_report.type());
   EXPECT_EQ(safe_browsing::ClientDownloadResponse::UNCOMMON,
             actual_report.download_verdict());
   EXPECT_EQ(download_url.spec(), actual_report.url());
   EXPECT_TRUE(actual_report.did_proceed());
+  EXPECT_EQ(kDownloadResponseToken, actual_report.token());
 
   download->Cancel(true);
 }
 
 IN_PROC_BROWSER_TEST_F(
      DownloadTestWithFakeSafeBrowsing,
      NoUncommonDownloadReportWithoutUserProceed) {
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled,
                                                true);
   // Make a dangerous file.
@@ skipping 274 matching lines @@
       DangerousDownloadWaiter(
           browser(), 1,
           content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
   ui_test_utils::NavigateToURL(browser(), extension_url);
 
   observer->WaitForFinished();
 
   // Download shelf should close.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }