commit c37f8b42ae69eb7070f46c0be0791c0c67bf2163
author jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 23 16:22:14 2010
committer jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 23 16:22:14 2010
tree 2f1a33c964833b2a2b78b9defe8d76b58ebedcc5
parent d63bfa7d4c4ed7a928c4a9cef41847fef8e29109

Load filter rules from preferences.

BUG=32782
TEST=unit_tests

Review URL: http://codereview.chromium.org/555033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36962 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser_prefs.cc

diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 710c4e05..bdab353 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/privacy_blacklist/blacklist.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -93,6 +94,7 @@
   BlockedPopupContainer::RegisterUserPrefs(user_prefs);
   HostZoomMap::RegisterUserPrefs(user_prefs);
   DevToolsManager::RegisterUserPrefs(user_prefs);
+  Blacklist::RegisterUserPrefs(user_prefs);
 #if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port.
   BrowserActionsContainer::RegisterUserPrefs(user_prefs);
 #endif