Move SafeBrowsingTriggeredPopupBlocker to //components/blocked_content
This creates a new blocked_content component. This will be used to share
popup blocking logic between Chrome and WebLayer. The first class moved
into the component is SafeBrowsingTriggeredPopupBlocker because it has
relatively few dependencies and is required to move other larger classes
like PopupBlockerTabHelper.
The tests were kept in //chrome for now, since they have some other
dependencies on //chrome/browser/ui/blocked_content, and will be easier
to move once more of that code has moved to the component.
Bug: 1084013
Change-Id: I3d34cb8cc7ab7eb738c62d843c316b56f99eb30a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2219355
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Charlie Harrison <[email protected]>
Commit-Queue: Clark DuVall <[email protected]>
Cr-Commit-Position: refs/heads/master@{#772921}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6678d440..6abde35 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -73,7 +73,6 @@
#include "chrome/browser/storage/appcache_feature_prefs.h"
#include "chrome/browser/task_manager/task_manager_interface.h"
#include "chrome/browser/tracing/chrome_tracing_delegate.h"
-#include "chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/hats/hats_service.h"
#include "chrome/browser/ui/navigation_correction_tab_observer.h"
@@ -93,6 +92,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/secure_origin_whitelist.h"
#include "components/autofill/core/common/autofill_prefs.h"
+#include "components/blocked_content/safe_browsing_triggered_popup_blocker.h"
#include "components/browsing_data/core/pref_names.h"
#include "components/certificate_transparency/pref_names.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -888,7 +888,8 @@
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
RegisterBrowserUserPrefs(registry);
safe_browsing::RegisterProfilePrefs(registry);
- SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(registry);
+ blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
+ registry);
security_state::RegisterProfilePrefs(registry);
SessionStartupPref::RegisterProfilePrefs(registry);
SharingSyncPreference::RegisterProfilePrefs(registry);
