Expose malware/phishing/etc. distinction from SafeBrowsingUIManager

components/security_state/security_state_model_unittest.cc

 // 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.
 
 #include "components/security_state/security_state_model.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/test/histogram_tester.h"
@@ skipping 16 matching lines @@
 
 class TestSecurityStateModelClient : public SecurityStateModelClient {
  public:
   TestSecurityStateModelClient()
       : url_(kHttpsUrl),
         connection_status_(net::SSL_CONNECTION_VERSION_TLS1_2
                            << net::SSL_CONNECTION_VERSION_SHIFT),
         cert_status_(net::CERT_STATUS_SHA1_SIGNATURE_PRESENT),
         displayed_mixed_content_(false),
         ran_mixed_content_(false),
-        fails_malware_check_(false),
+        malicious_content_status_(
+            SecurityStateModel::MALICIOUS_CONTENT_STATUS_NONE),
         displayed_password_field_on_http_(false),
         displayed_credit_card_field_on_http_(false) {
     cert_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "sha1_2016.pem");
   }
   ~TestSecurityStateModelClient() override {}
 
   void set_connection_status(int connection_status) {
     connection_status_ = connection_status;
   }
   void SetCipherSuite(uint16_t ciphersuite) {
     net::SSLConnectionStatusSetCipherSuite(ciphersuite, &connection_status_);
   }
   void AddCertStatus(net::CertStatus cert_status) {
     cert_status_ |= cert_status;
   }
   void SetDisplayedMixedContent(bool displayed_mixed_content) {
     displayed_mixed_content_ = displayed_mixed_content;
   }
   void SetRanMixedContent(bool ran_mixed_content) {
     ran_mixed_content_ = ran_mixed_content;
   }
-  void set_fails_malware_check(bool fails_malware_check) {
-    fails_malware_check_ = fails_malware_check;
+  void set_malicious_content_status(
+      SecurityStateModel::MaliciousContentStatus malicious_content_status) {
+    malicious_content_status_ = malicious_content_status;
   }
   void set_displayed_password_field_on_http(
       bool displayed_password_field_on_http) {
     displayed_password_field_on_http_ = displayed_password_field_on_http;
   }
   void set_displayed_credit_card_field_on_http(
       bool displayed_credit_card_field_on_http) {
     displayed_credit_card_field_on_http_ = displayed_credit_card_field_on_http;
   }
 
   void UseHttpUrl() { url_ = GURL(kHttpUrl); }
 
   // SecurityStateModelClient:
   void GetVisibleSecurityState(
       SecurityStateModel::VisibleSecurityState* state) override {
     state->connection_info_initialized = true;
     state->url = url_;
     state->certificate = cert_;
     state->cert_status = cert_status_;
     state->connection_status = connection_status_;
     state->security_bits = 256;
     state->displayed_mixed_content = displayed_mixed_content_;
     state->ran_mixed_content = ran_mixed_content_;
-    state->fails_malware_check = fails_malware_check_;
+    state->malicious_content_status = malicious_content_status_;
     state->displayed_password_field_on_http = displayed_password_field_on_http_;
     state->displayed_credit_card_field_on_http =
         displayed_credit_card_field_on_http_;
   }
 
   bool UsedPolicyInstalledCertificate() override { return false; }
 
   bool IsOriginSecure(const GURL& url) override {
     return url_ == GURL(kHttpsUrl);
   }
 
  private:
   GURL url_;
   scoped_refptr<net::X509Certificate> cert_;
   int connection_status_;
   net::CertStatus cert_status_;
   bool displayed_mixed_content_;
   bool ran_mixed_content_;
-  bool fails_malware_check_;
+  SecurityStateModel::MaliciousContentStatus malicious_content_status_;
   bool displayed_password_field_on_http_;
   bool displayed_credit_card_field_on_http_;
 };
 
 // Tests that SHA1-signed certificates expiring in 2016 downgrade the
 // security state of the page.
 TEST(SecurityStateModelTest, SHA1Warning) {
   TestSecurityStateModelClient client;
   SecurityStateModel model;
   model.SetClient(&client);
@@ skipping 96 matching lines @@
 TEST(SecurityStateModelTest, MalwareOverride) {
   TestSecurityStateModelClient client;
   SecurityStateModel model;
   model.SetClient(&client);
   // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 from
   // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-4
   const uint16_t ciphersuite = 0xc02f;
   client.set_connection_status(net::SSL_CONNECTION_VERSION_TLS1_2
                                << net::SSL_CONNECTION_VERSION_SHIFT);
   client.SetCipherSuite(ciphersuite);
-  client.set_fails_malware_check(true);
+  client.set_malicious_content_status(
+      SecurityStateModel::MALICIOUS_CONTENT_STATUS_MALWARE);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.fails_malware_check);
+  EXPECT_EQ(SecurityStateModel::MALICIOUS_CONTENT_STATUS_MALWARE,

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

nit: Do you want a check to verify it starts in the _NONE state?

[estark, 2016/11/11 20:28:14]

Done.

+            security_info.malicious_content_status);
   EXPECT_EQ(SecurityStateModel::DANGEROUS, security_info.security_level);
 }
 
 // Tests that the malware/phishing status is set, even if other connection info
 // is not available.
 TEST(SecurityStateModelTest, MalwareWithoutCOnnectionState) {
   TestSecurityStateModelClient client;
   SecurityStateModel model;
   model.SetClient(&client);
-  client.set_fails_malware_check(true);
+  client.set_malicious_content_status(
+      SecurityStateModel::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.fails_malware_check);
+  EXPECT_EQ(SecurityStateModel::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING,
+            security_info.malicious_content_status);
   EXPECT_EQ(SecurityStateModel::DANGEROUS, security_info.security_level);
 }
 
 // Tests that password fields cause the security level to be downgraded
 // to HTTP_SHOW_WARNING when the command-line switch is set.
 TEST(SecurityStateModelTest, PasswordFieldWarning) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kMarkHttpAs,
       switches::kMarkHttpWithPasswordsOrCcWithChip);
   TestSecurityStateModelClient client;
@@ skipping 77 matching lines @@
 
   // Ensure histogram recorded correctly even without a password input.
   client.set_displayed_password_field_on_http(false);
   model.GetSecurityInfo(&security_info);
   histograms.ExpectUniqueSample(kHistogramName, 2 /* HTTP_SHOW_WARNING */, 2);
 }
 
 }  // namespace
 
 }  // namespace security_state