Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/safe_browsing/download_protection_service_unittest.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/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 445 matching lines @@
 
   void OnClientDownloadRequest(content::DownloadItem* download,
                                const ClientDownloadRequest* request) {
     if (request)
       last_client_download_request_.reset(new ClientDownloadRequest(*request));
     else
       last_client_download_request_.reset();
   }
 
  public:
-  void CheckDoneCallback(
+  void CheckUrlDoneCallback(
       DownloadProtectionService::DownloadCheckResult result) {
     result_ = result;
     has_result_ = true;
     MessageLoop::current()->QuitWhenIdle();
   }
 
+  void CheckDoneCallback(
+      DownloadProtectionService::DownloadCheckResult result,
+      const std::string& unused_token) {
+    CheckUrlDoneCallback(result);
+  }
+
   void SyncCheckDoneCallback(
-      DownloadProtectionService::DownloadCheckResult result) {
+      DownloadProtectionService::DownloadCheckResult result,
+      const std::string& token_unused) {
     result_ = result;
     has_result_ = true;
   }
 
   void SendURLFetchComplete(net::TestURLFetcher* fetcher) {
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   testing::AssertionResult IsResult(
       DownloadProtectionService::DownloadCheckResult expected) {
@@ skipping 1097 matching lines @@
   EXPECT_CALL(item, GetHash()).WillRepeatedly(ReturnRef(hash));
 
   // CheckDownloadURL returns immediately which means the client object callback
   // will never be called.  Nevertheless the callback provided to
   // CheckClientDownload must still be called.
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain), NotNull()))
       .WillOnce(Return(true));
   download_service_->CheckDownloadUrl(
       item,
-      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
+      base::Bind(&DownloadProtectionServiceTest::CheckUrlDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
   Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain), NotNull()))
       .WillOnce(DoAll(CheckDownloadUrlDone(SB_THREAT_TYPE_SAFE),
                       Return(false)));
   download_service_->CheckDownloadUrl(
       item,
-      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
+      base::Bind(&DownloadProtectionServiceTest::CheckUrlDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
   Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain), NotNull()))
       .WillOnce(DoAll(
           CheckDownloadUrlDone(SB_THREAT_TYPE_URL_MALWARE),
           Return(false)));
   download_service_->CheckDownloadUrl(
       item,
-      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
+      base::Bind(&DownloadProtectionServiceTest::CheckUrlDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
   Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain),
                                NotNull()))
       .WillOnce(DoAll(
           CheckDownloadUrlDone(SB_THREAT_TYPE_BINARY_MALWARE_URL),
           Return(false)));
   download_service_->CheckDownloadUrl(
       item,
-      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
+      base::Bind(&DownloadProtectionServiceTest::CheckUrlDoneCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
 }
 
 TEST_F(DownloadProtectionServiceTest, TestDownloadRequestTimeout) {
   net::TestURLFetcherFactory factory;
 
   content::MockDownloadItem item;
   PrepareBasicDownloadItem(
@@ skipping 492 matching lines @@
       &item, base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                         base::Unretained(this)));
   MessageLoop::current()->Run();
 
   EXPECT_FALSE(HasClientDownloadRequest());
   // Overriden by flag:
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
 }
 
 }  // namespace safe_browsing