Add token field to ClientSafeBrowsingReportReqeust

chrome/browser/safe_browsing/download_protection_service.h

 // 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.
 //
 // Helper class which handles communication with the SafeBrowsing servers for
 // improved binary download protection.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_
 
@@ skipping 40 matching lines @@
     SAFE,
     DANGEROUS,
     UNCOMMON,
     DANGEROUS_HOST,
     POTENTIALLY_UNWANTED
   };
 
   // Callback type which is invoked once the download request is done.
   typedef base::Callback<void(DownloadCheckResult)> CheckDownloadCallback;
 
+  // Callback type which is invoked once the download content check is done.
+  typedef base::Callback<void(DownloadCheckResult, const std::string& token)>
+      CheckDownloadContentCallback;
+
   // A type of callback run on the main thread when a ClientDownloadRequest has
   // been formed for a download, or when one has not been formed for a supported
   // download.
   typedef base::Callback<void(content::DownloadItem*,
                               const ClientDownloadRequest*)>
       ClientDownloadRequestCallback;
 
   // A list of ClientDownloadRequest callbacks.
   typedef base::CallbackList<void(content::DownloadItem*,
                                   const ClientDownloadRequest*)>
@@ skipping 14 matching lines @@
   virtual void ParseManualBlacklistFlag();
 
   // Return true if this hash value is blacklisted via flag (for testing).
   virtual bool IsHashManuallyBlacklisted(const std::string& sha256_hash) const;
 
   // Checks whether the given client download is likely to be malicious or not.
   // The result is delivered asynchronously via the given callback.  This
   // method must be called on the UI thread, and the callback will also be
   // invoked on the UI thread.  This method must be called once the download
   // is finished and written to disk.
-  virtual void CheckClientDownload(content::DownloadItem* item,
-                                   const CheckDownloadCallback& callback);
+  virtual void CheckClientDownload(
+      content::DownloadItem* item,
+      const CheckDownloadContentCallback& callback);
 
   // Checks whether any of the URLs in the redirect chain of the
   // download match the SafeBrowsing bad binary URL list.  The result is
   // delivered asynchronously via the given callback.  This method must be
   // called on the UI thread, and the callback will also be invoked on the UI
   // thread.  Pre-condition: !info.download_url_chain.empty().
   virtual void CheckDownloadUrl(const content::DownloadItem& item,
                                 const CheckDownloadCallback& callback);
 
   // Returns true iff the download specified by |info| should be scanned by
   // CheckClientDownload() for malicious content.
   virtual bool IsSupportedDownload(const content::DownloadItem& item,
                                    const base::FilePath& target_path) const;
 
   virtual void CheckPPAPIDownloadRequest(
       const GURL& requestor_url,
       const base::FilePath& default_file_path,
       const std::vector<base::FilePath::StringType>& alternate_extensions,
-      const CheckDownloadCallback& callback);
+      const CheckDownloadContentCallback& callback);
 
   // Display more information to the user regarding the download specified by
   // |info|. This method is invoked when the user requests more information
   // about a download that was marked as malicious.
   void ShowDetailsForDownload(const content::DownloadItem& item,
                               content::PageNavigator* navigator);
 
   // Enables or disables the service.  This is usually called by the
   // SafeBrowsingService, which tracks whether any profile uses these services
   // at all.  Disabling causes any pending and future requests to have their
@@ skipping 145 matching lines @@
   std::set<std::string> manual_blacklist_hashes_;
 
   // Rate of whitelisted downloads we sample to send out download ping.
   double whitelist_sample_rate_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadProtectionService);
 };
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_