[subresource_filter] Force the popup blocker on sites with activation

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index c5abcfb88c15e0718e9cfd1db5480cde21320dea..9ffe985a9da01c388bbb6791d2fbd5b22f14251f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2550,7 +2550,13 @@ bool ChromeContentBrowserClient::CanCreateWindow(
       target_url, referrer, frame_name, disposition, features, user_gesture,
       opener_suppressed, opener_render_process_id, opener_render_frame_id);
 
-  if (!user_gesture &&
+  auto* driver_factory = subresource_filter::
+      ContentSubresourceFilterDriverFactory::FromWebContents(web_contents);
+  bool popup_block_candidate =

[engedy, 2017/04/24 10:03:27]

nit: const bool

[Charlie Harrison, 2017/04/24 15:41:54]

Done.

+      !user_gesture ||
+      (driver_factory &&
+       driver_factory->throttle_manager()->ShouldDisallowNewWindow());
+  if (popup_block_candidate &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePopupBlocking)) {
     if (content_settings->GetContentSetting(