Use DownloadItem directly in DownloadProtectionService.

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 21 matching lines @@
 class X509Certificate;
 }  // namespace net
 
 namespace safe_browsing {
 class SignatureUtil;
 
 // This class provides an asynchronous API to check whether a particular
 // client download is malicious or not.
 class DownloadProtectionService {
  public:
-  // TODO(noelutz): we're missing some fields here: server IPs,
-  // tab URL redirect chain, ...
-  struct DownloadInfo {
-    base::FilePath local_file;  // Where the download is currently stored.
-    base::FilePath target_file;  // Where it will eventually be stored.
-    std::vector<GURL> download_url_chain;
-    GURL referrer_url;
-    std::string sha256_hash;
-    int64 total_bytes;
-    bool user_initiated;
-    std::string remote_address;
-    bool zipped_executable;
-    DownloadInfo();
-    ~DownloadInfo();
-    std::string DebugString() const;
-    // Creates a DownloadInfo from a DownloadItem object.
-    static DownloadInfo FromDownloadItem(const content::DownloadItem& item);
-  };
-
   enum DownloadCheckResult {
     SAFE,
     DANGEROUS,
     UNCOMMON,
     DANGEROUS_HOST,
   };
 
   // Callback type which is invoked once the download request is done.
   typedef base::Callback<void(DownloadCheckResult)> CheckDownloadCallback;
 
   // Creates a download service.  The service is initially disabled.  You need
   // to call SetEnabled() to start it.  |sb_service| owns this object; we
   // keep a reference to |request_context_getter|.
   DownloadProtectionService(
       SafeBrowsingService* sb_service,
       net::URLRequestContextGetter* request_context_getter);
 
   virtual ~DownloadProtectionService();
 
   // 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(const DownloadInfo& info,
+  virtual void CheckClientDownload(content::DownloadItem* item,
                                    const CheckDownloadCallback& 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 DownloadInfo& info,
+  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 DownloadInfo& info) const;
+  virtual bool IsSupportedDownload(const content::DownloadItem& item,
+                                   const base::FilePath& target_path) const;
 
   // 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 DownloadInfo& info,
+  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
   // callbacks called with "SAFE" results.
   void SetEnabled(bool enabled);
 
   bool enabled() const {
     return enabled_;
@@ skipping 88 matching lines @@
   // SignatureUtil object, may be overridden for testing.
   scoped_refptr<SignatureUtil> signature_util_;
 
   int64 download_request_timeout_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadProtectionService);
 };
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_SERVICE_H_