From a307e31e82d2b9006802d4381dc5f3da2b993a8d Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Mon, 30 Nov 2009 16:11:27 +0000 Subject: Integrate BlacklistManager with Profile. Now each Profile has a BlacklistManager that maintains a compiled Blacklist for that Profile. The system does not yet pause user-initiated web requests until the blacklist system is ready. However, the code is not supposed to be ready, and is hidden behind a --enable-privacy-blacklists command-line flag. TEST=Covered by browser_test. BUG=21541 Review URL: http://codereview.chromium.org/371063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33290 0039d316-1c4b-4281-b951-d872f2087c98 --- .../data/extensions/common/privacy_blacklist/privacy_blacklist.pbl | 4 ++-- chrome/test/testing_profile.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/test') diff --git a/chrome/test/data/extensions/common/privacy_blacklist/privacy_blacklist.pbl b/chrome/test/data/extensions/common/privacy_blacklist/privacy_blacklist.pbl index b9dc8d2..df63d90 100644 --- a/chrome/test/data/extensions/common/privacy_blacklist/privacy_blacklist.pbl +++ b/chrome/test/data/extensions/common/privacy_blacklist/privacy_blacklist.pbl @@ -1,9 +1,9 @@ [Chromium::PrivacyBlacklist] |Name: AnnoyingAds -|URL: http://www.ads.tv +|URL: http://www.example.com # Block Ads by servers -annoying.ads.tv/@ => kBlockAll +example.com/@ => kBlockAll # Block Ads by name @/annoying/120x600.jpg => kBlockAll diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 37c35ea..b7f5ed8 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -145,7 +145,7 @@ class TestingProfile : public Profile { return NULL; } virtual net::SSLConfigService* GetSSLConfigService() { return NULL; } - virtual Blacklist* GetBlacklist() { return NULL; } + virtual BlacklistManager* GetBlacklistManager() { return NULL; } void set_session_service(SessionService* session_service) { session_service_ = session_service; } -- cgit v1.1