Propagate the SafeBrowsing download protection verdict to the DownloadItem.

content/browser/download/download_item.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.
 //
 // Each download is represented by a DownloadItem, and all DownloadItems
 // are owned by the DownloadManager which maintains a global list of all
 // downloads. DownloadItems are created when a user initiates a download,
 // and exist for the duration of the browser life time.
 //
 // Download observers:
@@ skipping 57 matching lines @@
     // Maximum value.
     MAX_DOWNLOAD_STATE
   };
 
   enum SafetyState {
     SAFE = 0,
     DANGEROUS,
     DANGEROUS_BUT_VALIDATED  // Dangerous but the user confirmed the download.
   };
 
-  // This enum is used by histograms.  Do not change the ordering or remove
-  // items.
-  enum DangerType {
-    NOT_DANGEROUS = 0,
-
-    // A dangerous file to the system (e.g.: an executable or extension from
-    // places other than gallery).
-    DANGEROUS_FILE,
-
-    // Safebrowsing service shows this URL leads to malicious file download.
-    DANGEROUS_URL,
-
-    // Memory space for histograms is determined by the max.
-    // ALWAYS ADD NEW VALUES BEFORE THIS ONE.
-    DANGEROUS_TYPE_MAX
-  };
-
   // Reason for deleting the download.  Passed to Delete().
   enum DeleteReason {
     DELETE_DUE_TO_BROWSER_SHUTDOWN = 0,
     DELETE_DUE_TO_USER_DISCARD
   };
 
   // A fake download table ID which represents a download that has started,
   // but is not yet in the table.
   static const int kUninitializedHandle;
 
@@ skipping 185 matching lines @@
   base::Time end_time() const { return end_time_; }
   void set_db_handle(int64 handle) { db_handle_ = handle; }
   int64 db_handle() const { return db_handle_; }
   DownloadManager* download_manager() { return download_manager_; }
   bool is_paused() const { return is_paused_; }
   bool open_when_complete() const { return open_when_complete_; }
   void set_open_when_complete(bool open) { open_when_complete_ = open; }
   bool file_externally_removed() const { return file_externally_removed_; }
   SafetyState safety_state() const { return safety_state_; }
   // Why |safety_state_| is not SAFE.
-  DangerType GetDangerType() const;
+  DownloadStateInfo::DangerType GetDangerType() const;
   bool IsDangerous() const;
   void MarkFileDangerous();
   void MarkUrlDangerous();
+  void MarkContentDangerous();
 
   bool auto_opened() { return auto_opened_; }
   const FilePath& target_name() const { return state_info_.target_name; }
   bool prompt_user_for_save_location() const {
     return state_info_.prompt_user_for_save_location;
   }
   bool is_otr() const { return is_otr_; }
   const FilePath& suggested_path() const { return state_info_.suggested_path; }
   bool is_temporary() const { return is_temporary_; }
   void set_opened(bool opened) { opened_ = opened; }
@@ skipping 43 matching lines @@
   // Internal helper for maintaining consistent received and total sizes.
   void UpdateSize(int64 size);
 
   // Called when the entire download operation (including renaming etc)
   // is completed.
   void Completed();
 
   // Call to transition state; all state transitions should go through this.
   void TransitionTo(DownloadState new_state);
 
-  // Called when safety_state_ should be recomputed from is_dangerous_file
-  // and is_dangerous_url.
+  // Called when safety_state_ should be recomputed from the DangerType of the
+  // state info.
   void UpdateSafetyState();
 
   // Helper function to recompute |state_info_.target_name| when
   // it may have changed.  (If it's non-null it should be left alone,
   // otherwise updated from |full_path_|.)
   void UpdateTarget();
 
   // State information used by the download manager.
   DownloadStateInfo state_info_;
 
@@ skipping 110 matching lines @@
   // only.
   bool open_enabled_;
 
   // Did the delegate delay calling Complete on this download?
   bool delegate_delayed_complete_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItem);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_H_