Expose malware/phishing/etc. distinction from SafeBrowsingUIManager

chrome/browser/ssl/chrome_security_state_model_client.cc

Index: chrome/browser/ssl/chrome_security_state_model_client.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client.cc b/chrome/browser/ssl/chrome_security_state_model_client.cc
index 91f94b325332b079b5805f7ff5e3650b51ffeed4..cb2cf252065d7d0696314fa135d86ed7185bc4c6 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client.cc
@@ -158,9 +158,33 @@ void CheckSafeBrowsingStatus(content::NavigationEntry* entry,
   if (!sb_service)
     return;
   scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
+  safe_browsing::SBThreatType threat_type;
   if (sb_ui_manager->IsUrlWhitelistedOrPendingForWebContents(
-          entry->GetURL(), false, entry, web_contents, false)) {
-    state->fails_malware_check = true;
+          entry->GetURL(), false, entry, web_contents, false, &threat_type)) {
+    switch (threat_type) {
+      case safe_browsing::SB_THREAT_TYPE_SAFE:
+        break;
+      case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
+      case safe_browsing::SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL:
+        state->malicious_content_status = security_state::SecurityStateModel::
+            MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
+        break;
+      case safe_browsing::SB_THREAT_TYPE_URL_MALWARE:
+      case safe_browsing::SB_THREAT_TYPE_BINARY_MALWARE_URL:
+      case safe_browsing::SB_THREAT_TYPE_EXTENSION:

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

nit: I think _EXTENSION and _BINARY_MALWARE_URL won't ever be associated with an
interstitial.  So therefore those could move down to the NOTREACHED section.

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

Done.

+      case safe_browsing::SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL:
+        state->malicious_content_status = security_state::SecurityStateModel::
+            MALICIOUS_CONTENT_STATUS_MALWARE;
+        break;
+      case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
+        state->malicious_content_status = security_state::SecurityStateModel::
+            MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
+        break;
+      case safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE:

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

Maybe add a comment that these are not associated with interstitials.  I'm sure
we'll add some new types in the future, and we'll need to add them here as well.

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

Done.

+      case safe_browsing::SB_THREAT_TYPE_API_ABUSE:
+        NOTREACHED();
+        break;
+    }
   }
 }