Remove OpenURLParam logic from Safe Browsing popup blocker

This logic is pulled out and looked at by the popup_blocker.cc, since
we never want to block these types of popups even if we add additional
popup policy.

While we're at it, rename ShouldApplyStrongPopupBlocker to
ShouldApplyAbusivePopupBlocker, which is more precise.

Bug: None
Change-Id: Id9f31522f697b4ead95e8e23b89da325c0960f3e
Reviewed-on: https://chromium-review.googlesource.com/c/1311260Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604421}

chrome/browser/subresource_filter/subresource_filter_abusive_unittest.cc

@@ -121,7 +121,7 @@ TEST_P(SubresourceFilterAbusiveTest, ConfigCombination) {
   SimulateNavigateAndCommit(url, main_rfh());
 
   bool disallow_requests = !CreateAndNavigateDisallowedSubframe(main_rfh());
-  bool disallow_popups = popup_blocker_->ShouldApplyStrongPopupBlocker(nullptr);
+  bool disallow_popups = popup_blocker_->ShouldApplyAbusivePopupBlocker();
 
   bool any_activation_enforce =
       bas_level_ == METADATA_ENFORCE ||

chrome/browser/ui/blocked_content/popup_blocker.cc

@@ -50,10 +50,18 @@ PopupBlockType ShouldBlockPopup(content::WebContents* web_contents,
   if (!user_gesture)
     return PopupBlockType::kNoGesture;
 
+  // This is trusted user action (e.g. shift-click), so make sure it is not
+  // blocked.
+  if (open_url_params &&
+      open_url_params->triggering_event_info !=
+          blink::WebTriggeringEventInfo::kFromUntrustedEvent) {
+    return PopupBlockType::kNotBlocked;
+  }
+
   auto* safe_browsing_blocker =
       SafeBrowsingTriggeredPopupBlocker::FromWebContents(web_contents);
   if (safe_browsing_blocker &&
-      safe_browsing_blocker->ShouldApplyStrongPopupBlocker(open_url_params)) {
+      safe_browsing_blocker->ShouldApplyAbusivePopupBlocker()) {
     return PopupBlockType::kAbusive;
   }
   return PopupBlockType::kNotBlocked;

chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.cc

@@ -16,7 +16,6 @@
 #include "components/safe_browsing/db/v4_protocol_manager_util.h"
 #include "components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.h"
 #include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/console_message_level.h"
@@ -89,27 +88,19 @@ void SafeBrowsingTriggeredPopupBlocker::MaybeCreate(
 SafeBrowsingTriggeredPopupBlocker::~SafeBrowsingTriggeredPopupBlocker() =
     default;
 
-bool SafeBrowsingTriggeredPopupBlocker::ShouldApplyStrongPopupBlocker(
-    const content::OpenURLParams* open_url_params) {
+bool SafeBrowsingTriggeredPopupBlocker::ShouldApplyAbusivePopupBlocker() {
   LogAction(Action::kConsidered);
   if (!current_page_data_->is_triggered())
     return false;
 
-  bool should_block = true;
-  if (open_url_params) {
-    should_block = open_url_params->triggering_event_info ==
-                   blink::WebTriggeringEventInfo::kFromUntrustedEvent;
-  }
   if (!IsEnabled(web_contents()))
     return false;
 
-  if (should_block) {
-    LogAction(Action::kBlocked);
-    current_page_data_->inc_num_popups_blocked();
-    web_contents()->GetMainFrame()->AddMessageToConsole(
-        content::CONSOLE_MESSAGE_LEVEL_ERROR, kAbusiveEnforceMessage);
-  }
-  return should_block;
+  LogAction(Action::kBlocked);
+  current_page_data_->inc_num_popups_blocked();
+  web_contents()->GetMainFrame()->AddMessageToConsole(
+      content::CONSOLE_MESSAGE_LEVEL_ERROR, kAbusiveEnforceMessage);
+  return true;
 }
 
 SafeBrowsingTriggeredPopupBlocker::SafeBrowsingTriggeredPopupBlocker(

chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.h

@@ -17,7 +17,6 @@
 #include "content/public/browser/web_contents_observer.h"
 
 namespace content {
-struct OpenURLParams;
 class WebContents;
 }  // namespace content
 
@@ -77,8 +76,7 @@ class SafeBrowsingTriggeredPopupBlocker
   static void MaybeCreate(content::WebContents* web_contents);
   ~SafeBrowsingTriggeredPopupBlocker() override;
 
-  bool ShouldApplyStrongPopupBlocker(
-      const content::OpenURLParams* open_url_params);
+  bool ShouldApplyAbusivePopupBlocker();
 
  private:
   // The |web_contents| and |observer_manager| are expected to be