|
|
Implement delaying resource requests until privacy blacklists are ready.
Associate a BlacklistRequestInfo with each URLRequest started by ResourceDispatcherHost so that in various places we get access to the right BlacklistManager (each Profile has its own), and lazily cache a Blacklist::Match.
BlacklistListener controls delaying requests until the privacy blacklist is ready for the request.
BlacklistInterceptor handles substituting real response with a blocking page or blocking image. I've temporarily removed support for unblocking things. It was too hacky.
This change also removes a large block of blacklist-related code from RDH to more focused classes. Should make it a little more readable.
This should also make BlacklistManagerBrowserTest not flaky.
TEST=Covered by browser_tests and unit_tests.
BUG= 21541, 29113
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35538
Total comments: 44
Total comments: 9
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+1075 lines, -517 lines) |
Patch |
 |
M |
chrome/app/generated_resources.grd
|
View
|
1
2
3
4
5
6
7
8
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/net/chrome_url_request_context.h
|
View
|
1
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/net/chrome_url_request_context.cc
|
View
|
1
2
3
4
5
6
7
8
|
2 chunks |
+51 lines, -34 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist.h
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist.cc
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_interceptor.h
|
View
|
|
1 chunk |
+23 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_interceptor.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+141 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_interceptor_unittest.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+94 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_listener.h
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+68 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_listener.cc
|
View
|
1
2
3
4
5
6
7
8
|
1 chunk |
+92 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_listener_unittest.cc
|
View
|
7
|
1 chunk |
+183 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist_manager.h
|
View
|
|
2 chunks |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist_manager.cc
|
View
|
|
5 chunks |
+42 lines, -7 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc
|
View
|
|
4 chunks |
+10 lines, -39 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc
|
View
|
1
2
3
4
5
|
4 chunks |
+7 lines, -90 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_request_info.h
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+47 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_request_info.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_test_util.h
|
View
|
1
2
3
4
5
6
|
1 chunk |
+64 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/privacy_blacklist/blacklist_test_util.cc
|
View
|
1
2
|
1 chunk |
+76 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/privacy_blacklist/blacklist_ui.cc
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+31 lines, -25 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/privacy_blacklist/blocked_response.h
|
View
|
|
1 chunk |
+0 lines, -57 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/privacy_blacklist/blocked_response.cc
|
View
|
|
1 chunk |
+0 lines, -104 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/resource_dispatcher_host.h
|
View
|
|
3 chunks |
+9 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/resource_dispatcher_host.cc
|
View
|
1
2
3
4
5
6
7
|
8 chunks |
+32 lines, -83 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/resource_message_filter.cc
|
View
|
1
2
3
4
5
|
3 chunks |
+23 lines, -14 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/resources/privacy_blacklist_block.html
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/chrome_browser.gypi
|
View
|
1
2
3
4
5
6
7
8
|
2 chunks |
+7 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_tests.gypi
|
View
|
1
2
3
4
5
6
7
8
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
M |
net/url_request/url_request_unittest.h
|
View
|
1
|
3 chunks |
+34 lines, -10 lines |
0 comments
|
Download
|
 |
M |
net/url_request/url_request_unittest.cc
|
View
|
1
2
|
1 chunk |
+0 lines, -33 lines |
0 comments
|
Download
|
Total messages: 11 (0 generated)
|