Expose malware/phishing/etc. distinction from SafeBrowsingUIManager

components/security_state/security_state_model.h

 // Copyright 2015 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 COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 76 matching lines @@
   // load. Content can be passive content that is displayed (such as
   // images) or active content that is run (such as scripts or iframes).
   enum ContentStatus {
     CONTENT_STATUS_UNKNOWN,
     CONTENT_STATUS_NONE,
     CONTENT_STATUS_DISPLAYED,
     CONTENT_STATUS_RAN,
     CONTENT_STATUS_DISPLAYED_AND_RAN,
   };
 
+  // Describes whether the page contains malicious resources such as
+  // malware or phishing attacks.
+  enum MaliciousContentStatus {
+    MALICIOUS_CONTENT_STATUS_NONE,
+    MALICIOUS_CONTENT_STATUS_MALWARE,

[estark, 2016/11/09 16:07:44]

These different statuses will be used to distinguish which page info strings to
use (strings are in the bug, 646629)

[Nathan Parker, 2016/11/10 00:13:03]

Acknowledged.

+    MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE,
+    MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING,
+  };
+
   // Describes the security status of a page or request. This is the
   // main data structure provided by this class.
   struct SecurityInfo {
     SecurityInfo();
     ~SecurityInfo();
     SecurityLevel security_level;
-    // True if the page fails the browser's malware or phishing checks.
-    bool fails_malware_check;
+    // Describes the nature of the page's malicious content, if any.
+    MaliciousContentStatus malicious_content_status;
     SHA1DeprecationStatus sha1_deprecation_status;
     // |mixed_content_status| describes the presence of content that was
     // loaded over a nonsecure (HTTP) connection.
     ContentStatus mixed_content_status;
     // |content_with_cert_errors_status| describes the presence of
     // content that was loaded over an HTTPS connection with
     // certificate errors.
     ContentStatus content_with_cert_errors_status;
     // The verification statuses of the signed certificate timestamps
     // for the connection.
@@ skipping 29 matching lines @@
 
   // Contains the security state relevant to computing the SecurityInfo
   // for a page. This is the input to GetSecurityInfo() provided by the
   // model's client.
   struct VisibleSecurityState {
     VisibleSecurityState();
     ~VisibleSecurityState();
     bool operator==(const VisibleSecurityState& other) const;
     GURL url;
 
-    // True if the page fails the browser's malware or phishing checks.
-    bool fails_malware_check;
+    MaliciousContentStatus malicious_content_status;
 
     // CONNECTION SECURITY FIELDS
     // Whether the connection security fields are initialized.
     bool connection_info_initialized;
     // The following fields contain information about the connection
     // used to load the page or request.
     scoped_refptr<net::X509Certificate> certificate;
     net::CertStatus cert_status;
     int connection_status;
     // The ID of the (EC)DH group used by the key exchange. The value is zero if
@@ skipping 35 matching lines @@
 
  private:
   SecurityStateModelClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityStateModel);
 };
 
 }  // namespace security_state
 
 #endif  // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_