Updating v4 DB manager to check suspicious site list.

Bug: 817377
Change-Id: I50b7cebc5e9fa32bec2a48c343731bc133261c47
Reviewed-on: https://chromium-review.googlesource.com/1015502Reviewed-by: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Luke Z <lpz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553076}

chrome/browser/safe_browsing/url_checker_delegate_impl.cc

@@ -60,10 +60,15 @@ UrlCheckerDelegateImpl::UrlCheckerDelegateImpl(
     scoped_refptr<SafeBrowsingUIManager> ui_manager)
     : database_manager_(std::move(database_manager)),
       ui_manager_(std::move(ui_manager)),
-      threat_types_(
-          CreateSBThreatTypeSet({safe_browsing::SB_THREAT_TYPE_URL_MALWARE,
-                                 safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
-                                 safe_browsing::SB_THREAT_TYPE_URL_UNWANTED})) {
+      threat_types_(CreateSBThreatTypeSet({
+// TODO(crbug.com/835961): Enable on Android when list is available.
+#if defined(SAFE_BROWSING_DB_LOCAL)
+        safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE,
+#endif
+            safe_browsing::SB_THREAT_TYPE_URL_MALWARE,
+            safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
+            safe_browsing::SB_THREAT_TYPE_URL_UNWANTED
+      })) {
 }
 
 UrlCheckerDelegateImpl::~UrlCheckerDelegateImpl() = default;

components/safe_browsing/browser/safe_browsing_url_checker_impl.cc

@@ -134,7 +134,10 @@ void SafeBrowsingUrlCheckerImpl::OnCheckBrowseUrlResult(
       "safe_browsing", "CheckUrl", this, "result",
       threat_type == SB_THREAT_TYPE_SAFE ? "safe" : "unsafe");
 
-  if (threat_type == SB_THREAT_TYPE_SAFE) {
+  if (threat_type == SB_THREAT_TYPE_SAFE ||
+      threat_type == SB_THREAT_TYPE_SUSPICIOUS_SITE) {
+    // TODO(lpz): Suspicious sites are treated as safe for now. Trigger
+    // a suspicious site report here instead.
     state_ = STATE_NONE;
 
     if (!RunNextCallback(true, false))

components/safe_browsing/db/v4_local_database_manager.cc

@@ -110,6 +110,8 @@ ThreatSeverity GetThreatSeverity(const ListIdentifier& list_id) {
       return 2;
     case CSD_WHITELIST:
       return 3;
+    case SUSPICIOUS:
+      return 4;
     default:
       NOTREACHED() << "Unexpected ThreatType encountered: "
                    << list_id.threat_type();
@@ -129,6 +131,9 @@ ListIdentifier GetUrlIdFromSBThreatType(SBThreatType sb_threat_type) {
     case SB_THREAT_TYPE_URL_UNWANTED:
       return GetUrlUwsId();
 
+    case SB_THREAT_TYPE_SUSPICIOUS_SITE:
+      return GetUrlSuspiciousSiteId();
+
     default:
       NOTREACHED();
       // Compiler requires a return statement here.

components/safe_browsing/db/v4_protocol_manager_util.cc

@@ -184,6 +184,7 @@ bool SBThreatTypeSetIsValidForCheckBrowseUrl(const SBThreatTypeSet& set) {
       case SB_THREAT_TYPE_URL_PHISHING:
       case SB_THREAT_TYPE_URL_MALWARE:
       case SB_THREAT_TYPE_URL_UNWANTED:
+      case SB_THREAT_TYPE_SUSPICIOUS_SITE:
         break;
 
       default: