This CL integrates the new SafeBrowsing download service class

chrome/browser/download/chrome_download_manager_delegate.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
@@ skipping 82 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<ChromeDownloadManagerDelegate>;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Callback function after url is checked with safebrowsing service.
-  void CheckDownloadUrlDone(int32 download_id, bool is_dangerous_url);
+  void CheckDownloadUrlDone(
+      int32 download_id,
+      safe_browsing::DownloadProtectionService::DownloadCheckResult result);
+
+  // Callback function after the DownloadProtectionService completes.
+  void CheckClientDownloadDone(
+      int32 download_id,
+      safe_browsing::DownloadProtectionService::DownloadCheckResult result);
 
   // Callback function after we check whether the referrer URL has been visited
   // before today.
   void CheckVisitedReferrerBeforeDone(int32 download_id,
                                       bool visited_referrer_before);
 
   // Called on the download thread to check whether the suggested file path
   // exists.  We don't check if the file exists on the UI thread to avoid UI
   // stalls from interacting with the file system.
   void CheckIfSuggestedPathExists(int32 download_id,
                                   DownloadStateInfo state,
                                   const FilePath& default_path);
 
   // Called on the UI thread once it's determined whether the suggested file
   // path exists.
   void OnPathExistenceAvailable(int32 download_id,
                                 const DownloadStateInfo& new_state);
 
   // Returns true if this download should show the "dangerous file" warning.
   // Various factors are considered, such as the type of the file, whether a
   // user action initiated the download, and whether the user has explicitly
   // marked the file type as "auto open".
   bool IsDangerousFile(const DownloadItem& download,
                        const DownloadStateInfo& state,
                        bool visited_referrer_before);
 
   // Callback from history system.
   void OnItemAddedToPersistentStore(int32 download_id, int64 db_handle);
 
-  // Callback function after download file hash is checked with safebrowsing
-  // service.
-  void CheckDownloadHashDone(int32 download_id, bool is_dangerous_hash);
-
-  // Callback function after the DownloadProtectionService completes.
-  void CheckClientDownloadDone(
-      int32 download_id,
-      safe_browsing::DownloadProtectionService::DownloadCheckResult result);
-
   Profile* profile_;
   scoped_ptr<DownloadPrefs> download_prefs_;
   scoped_ptr<DownloadHistory> download_history_;
 
   // Maps from pending extension installations to DownloadItem IDs.
   typedef base::hash_map<CrxInstaller*, int> CrxInstallerMap;
   CrxInstallerMap crx_installers_;
 
+  // Maps the SafeBrowsing download check state to a DownloadItem ID.
+  struct SafeBrowsingState {
+    // If true the SafeBrowsing check is not done yet.
+    bool pending;
+    // The verdict that we got from calling CheckClientDownload.
+    safe_browsing::DownloadProtectionService::DownloadCheckResult verdict;
+  };
+  typedef base::hash_map<int, SafeBrowsingState> SafeBrowsingStateMap;
+  SafeBrowsingStateMap safe_browsing_state_;
+
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_