diff options
| author | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 15:18:24 +0000 |
|---|---|---|
| committer | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 15:18:24 +0000 |
| commit | 653aa54bd4a87008873f5d3154eb6d82f222f029 (patch) | |
| tree | 684bafb0fcd5d665b45c94b1a3b145f6bd3c3d19 /chrome/test | |
| parent | 48d8e47acc6f19fd9785ef0bcc697d0ca9ac4172 (diff) | |
| download | chromium_src-653aa54bd4a87008873f5d3154eb6d82f222f029.zip chromium_src-653aa54bd4a87008873f5d3154eb6d82f222f029.tar.gz chromium_src-653aa54bd4a87008873f5d3154eb6d82f222f029.tar.bz2 | |
Load Multiple Blacklists
Add the ability to load multiple text blacklists into the binary blacklist representation.
NOTE: Included Binary file means this change expects to fail on the trybots
in blacklist_io_test.cc:103. All other checks must pass.
BUG=16932
TEST=BlacklistIO*
Review URL: http://codereview.chromium.org/159199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/blacklist_samples/annoying_ads.pbl | 12 | ||||
| -rw-r--r-- | chrome/test/data/blacklist_samples/block_flash.pbl | 5 | ||||
| -rw-r--r-- | chrome/test/data/blacklist_samples/combine3.pbr | bin | 0 -> 305 bytes | |||
| -rw-r--r-- | chrome/test/data/blacklist_samples/session_cookies.pbl | 6 |
4 files changed, 23 insertions, 0 deletions
diff --git a/chrome/test/data/blacklist_samples/annoying_ads.pbl b/chrome/test/data/blacklist_samples/annoying_ads.pbl new file mode 100644 index 0000000..b9dc8d2 --- /dev/null +++ b/chrome/test/data/blacklist_samples/annoying_ads.pbl @@ -0,0 +1,12 @@ +[Chromium::PrivacyBlacklist] +|Name: AnnoyingAds +|URL: http://www.ads.tv + +# Block Ads by servers +annoying.ads.tv/@ => kBlockAll + +# Block Ads by name +@/annoying/120x600.jpg => kBlockAll + +# Block Ads by path +@/annoying_ads/@ => kBlockAll diff --git a/chrome/test/data/blacklist_samples/block_flash.pbl b/chrome/test/data/blacklist_samples/block_flash.pbl new file mode 100644 index 0000000..2373f30 --- /dev/null +++ b/chrome/test/data/blacklist_samples/block_flash.pbl @@ -0,0 +1,5 @@ +[Chromium::PrivacyBlacklist] +|Name: BlockFlash +|URL: http://www.google.com + +@ => kBlockByType(application/x-shockwave-flash) diff --git a/chrome/test/data/blacklist_samples/combine3.pbr b/chrome/test/data/blacklist_samples/combine3.pbr Binary files differnew file mode 100644 index 0000000..30ef556 --- /dev/null +++ b/chrome/test/data/blacklist_samples/combine3.pbr diff --git a/chrome/test/data/blacklist_samples/session_cookies.pbl b/chrome/test/data/blacklist_samples/session_cookies.pbl new file mode 100644 index 0000000..f83727b --- /dev/null +++ b/chrome/test/data/blacklist_samples/session_cookies.pbl @@ -0,0 +1,6 @@ +[Chromium::PrivacyBlacklist] +|Name: SessionCookies +|URL: http://www.google.com + +# Block all Flash media everywhere. +@ => kDontPersistCookies |