Connecting list check and trigger for Suspicious Sites.

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

android_webview/browser/aw_url_checker_delegate_impl.cc

@@ -77,6 +77,10 @@ bool AwUrlCheckerDelegateImpl::ShouldSkipRequestCheck(
   return client && !client->GetSafeBrowsingEnabled();
 }
 
+void AwUrlCheckerDelegateImpl::NotifySuspiciousSiteDetected(
+    const base::RepeatingCallback<content::WebContents*()>&
+        web_contents_getter) {}
+
 const safe_browsing::SBThreatTypeSet&
 AwUrlCheckerDelegateImpl::GetThreatTypes() {
   return threat_types_;

android_webview/browser/aw_url_checker_delegate_impl.h

@@ -50,6 +50,9 @@ class AwUrlCheckerDelegateImpl : public safe_browsing::UrlCheckerDelegate {
                               int render_process_id,
                               int render_frame_id,
                               bool originated_from_service_worker) override;
+  void NotifySuspiciousSiteDetected(
+      const base::RepeatingCallback<content::WebContents*()>&
+          web_contents_getter) override;
   const safe_browsing::SBThreatTypeSet& GetThreatTypes() override;
   safe_browsing::SafeBrowsingDatabaseManager* GetDatabaseManager() override;
   safe_browsing::BaseUIManager* GetUIManager() override;

chrome/browser/safe_browsing/url_checker_delegate_impl.cc

@@ -14,6 +14,7 @@
 #include "components/safe_browsing/common/safe_browsing_prefs.h"
 #include "components/safe_browsing/db/database_manager.h"
 #include "components/safe_browsing/db/v4_protocol_manager_util.h"
+#include "components/safe_browsing/triggers/suspicious_site_trigger.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "services/network/public/cpp/features.h"
@@ -111,6 +112,15 @@ bool UrlCheckerDelegateImpl::ShouldSkipRequestCheck(
                                                            original_url);
 }
 
+void UrlCheckerDelegateImpl::NotifySuspiciousSiteDetected(
+    const base::RepeatingCallback<content::WebContents*()>&
+        web_contents_getter) {
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::BindOnce(&NotifySuspiciousSiteTriggerDetected,
+                     web_contents_getter));
+}
+
 const SBThreatTypeSet& UrlCheckerDelegateImpl::GetThreatTypes() {
   return threat_types_;
 }

chrome/browser/safe_browsing/url_checker_delegate_impl.h

@@ -40,6 +40,9 @@ class UrlCheckerDelegateImpl : public UrlCheckerDelegate {
                               int render_process_id,
                               int render_frame_id,
                               bool originated_from_service_worker) override;
+  void NotifySuspiciousSiteDetected(
+      const base::RepeatingCallback<content::WebContents*()>&
+          web_contents_getter) override;
   const SBThreatTypeSet& GetThreatTypes() override;
   SafeBrowsingDatabaseManager* GetDatabaseManager() override;
   BaseUIManager* GetUIManager() override;

components/safe_browsing/browser/base_parallel_resource_throttle_unittest.cc

@@ -126,6 +126,9 @@ class TestUrlCheckerDelegate : public UrlCheckerDelegate {
     return false;
   }
 
+  void NotifySuspiciousSiteDetected(
+      const base::RepeatingCallback<content::WebContents*()>&
+          web_contents_getter) override {}
   const SBThreatTypeSet& GetThreatTypes() override { return threat_types_; }
   SafeBrowsingDatabaseManager* GetDatabaseManager() override {
     return database_manager_.get();

components/safe_browsing/browser/safe_browsing_url_checker_impl.cc

@@ -136,10 +136,12 @@ void SafeBrowsingUrlCheckerImpl::OnCheckBrowseUrlResult(
 
   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 (threat_type == SB_THREAT_TYPE_SUSPICIOUS_SITE) {
+      url_checker_delegate_->NotifySuspiciousSiteDetected(web_contents_getter_);
+    }
+
     if (!RunNextCallback(true, false))
       return;
 

components/safe_browsing/browser/url_checker_delegate.h

@@ -68,6 +68,13 @@ class UrlCheckerDelegate
       int render_frame_id,
       bool originated_from_service_worker) = 0;
 
+  // Notifies the SafeBrowsing Trigger Manager that a suspicious site has been
+  // detected. |web_contents_getter| is used to determine which tab the site
+  // was detected on.
+  virtual void NotifySuspiciousSiteDetected(
+      const base::RepeatingCallback<content::WebContents*()>&
+          web_contents_getter) = 0;
+
   virtual const SBThreatTypeSet& GetThreatTypes() = 0;
   virtual SafeBrowsingDatabaseManager* GetDatabaseManager() = 0;
   virtual BaseUIManager* GetUIManager() = 0;

components/safe_browsing/triggers/suspicious_site_trigger.cc

@@ -36,6 +36,19 @@ const char kSuspiciousSiteTriggerReportRejectionMetricName[] =
 const char kSuspiciousSiteTriggerReportDelayStateMetricName[] =
     "SafeBrowsing.Triggers.SuspiciousSite.DelayTimerState";
 
+void NotifySuspiciousSiteTriggerDetected(
+    const base::RepeatingCallback<content::WebContents*()>&
+        web_contents_getter) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  content::WebContents* web_contents = web_contents_getter.Run();
+  if (web_contents) {
+    safe_browsing::SuspiciousSiteTrigger* trigger =
+        safe_browsing::SuspiciousSiteTrigger::FromWebContents(web_contents);
+    if (trigger)
+      trigger->SuspiciousSiteDetected();
+  }
+}
+
 SuspiciousSiteTrigger::SuspiciousSiteTrigger(
     content::WebContents* web_contents,
     TriggerManager* trigger_manager,

components/safe_browsing/triggers/suspicious_site_trigger.h

@@ -65,6 +65,14 @@ enum class SuspiciousSiteTriggerEvent {
   kMaxValue = REPORT_FINISH_FAILED
 };
 
+// Notify a suspicious site trigger on a particular tab that a suspicious site
+// was detected. |web_contents_getter| specifies the tab where the site was
+// detected.
+// Must be called on UI thread.
+void NotifySuspiciousSiteTriggerDetected(
+    const base::RepeatingCallback<content::WebContents*()>&
+        web_contents_getter);
+
 // This class watches tab-level events such as the start and end of a page
 // load, and also listens for events from the SuspiciousSiteURLThrottle that
 // indicate there was a hit on the suspicious site list. This trigger is