[subresource_filter] Force the popup blocker on sites with activation

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2532 matching lines @@
                                         opener_render_frame_id,
                                         opener_top_level_frame_url);
     return false;
   }
 #endif
 
   BlockedWindowParams blocked_params(
       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(
             opener_top_level_frame_url, opener_top_level_frame_url,
             CONTENT_SETTINGS_TYPE_POPUPS,
             std::string()) != CONTENT_SETTING_ALLOW) {
       HandleBlockedPopupOnUIThread(blocked_params);
       return false;
     }
   }
@@ skipping 1073 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }