Expose malware/phishing/etc. distinction from SafeBrowsingUIManager

components/security_state/security_state_model_unittest.cc

Index: components/security_state/security_state_model_unittest.cc
diff --git a/components/security_state/security_state_model_unittest.cc b/components/security_state/security_state_model_unittest.cc
index 7776a0c5ba5e492df8a36efef7d189ad3a2db7c9..0b1994d74018d9593a9928c825c6b368965262a2 100644
--- a/components/security_state/security_state_model_unittest.cc
+++ b/components/security_state/security_state_model_unittest.cc
@@ -34,7 +34,8 @@ class TestSecurityStateModelClient : public SecurityStateModelClient {
         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_ =
@@ -57,8 +58,9 @@ class TestSecurityStateModelClient : public SecurityStateModelClient {
   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) {
@@ -82,7 +84,7 @@ class TestSecurityStateModelClient : public SecurityStateModelClient {
     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_;
@@ -101,7 +103,7 @@ class TestSecurityStateModelClient : public SecurityStateModelClient {
   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_;
 };
@@ -218,10 +220,12 @@ TEST(SecurityStateModelTest, MalwareOverride) {
   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);
 }
 
@@ -231,10 +235,12 @@ 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);
 }