| Index: chrome/browser/renderer_host/resource_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
|
| index c78b935b1a4224897659ebd2cd4923f6eec56e71..6b56ab1394d16932fa5e1b3e65c0f27274c6497b 100644
|
| --- a/chrome/browser/renderer_host/resource_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/resource_message_filter.cc
|
| @@ -39,8 +39,6 @@
|
| #include "chrome/browser/pref_service.h"
|
| #include "chrome/browser/printing/print_job_manager.h"
|
| #include "chrome/browser/printing/printer_query.h"
|
| -#include "chrome/browser/privacy_blacklist/blacklist.h"
|
| -#include "chrome/browser/privacy_blacklist/blacklist_ui.h"
|
| #include "chrome/browser/profile.h"
|
| #include "chrome/browser/renderer_host/audio_renderer_host.h"
|
| #include "chrome/browser/renderer_host/browser_render_process_host.h"
|
| @@ -159,15 +157,6 @@ void RenderParamsFromPrintSettings(const printing::PrintSettings& settings,
|
| #endif
|
| }
|
|
|
| -Blacklist::Match* GetPrivacyBlacklistMatchForURL(
|
| - const GURL& url, ChromeURLRequestContext* context) {
|
| - const Blacklist* blacklist = context->GetPrivacyBlacklist();
|
| - // TODO(phajdan.jr): DCHECK(blacklist_manager) when blacklists are stable.
|
| - if (!blacklist)
|
| - return NULL;
|
| - return blacklist->FindMatch(url);
|
| -}
|
| -
|
| class SetCookieCompletion : public net::CompletionCallback {
|
| public:
|
| SetCookieCompletion(int render_process_id,
|
| @@ -394,10 +383,6 @@ ResourceMessageFilter::~ResourceMessageFilter() {
|
| // Called on the IPC thread:
|
| void ResourceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
|
| channel_ = channel;
|
| -
|
| - // Add the observers to intercept.
|
| - registrar_.Add(this, NotificationType::BLACKLIST_NONVISUAL_RESOURCE_BLOCKED,
|
| - NotificationService::AllSources());
|
| }
|
|
|
| // Called on the IPC thread:
|
| @@ -676,11 +661,6 @@ void ResourceMessageFilter::OnSetCookie(const IPC::Message& message,
|
| const std::string& cookie) {
|
| ChromeURLRequestContext* context = GetRequestContextForURL(url);
|
|
|
| - scoped_ptr<Blacklist::Match> match(
|
| - GetPrivacyBlacklistMatchForURL(url, context));
|
| - if (match.get() && (match->attributes() & Blacklist::kBlockCookies))
|
| - return;
|
| -
|
| SetCookieCompletion* callback =
|
| new SetCookieCompletion(id(), message.routing_id(), url, cookie, context);
|
|
|
| @@ -1314,15 +1294,6 @@ void ResourceMessageFilter::OnUpdateSpellingPanelWithMisspelledWord(
|
| SpellCheckerPlatform::UpdateSpellingPanelWithMisspelledWord(word);
|
| }
|
|
|
| -void ResourceMessageFilter::Observe(NotificationType type,
|
| - const NotificationSource &source,
|
| - const NotificationDetails &details) {
|
| - if (type == NotificationType::BLACKLIST_NONVISUAL_RESOURCE_BLOCKED) {
|
| - BlacklistUI::OnNonvisualContentBlocked(
|
| - Details<const URLRequest>(details).ptr());
|
| - }
|
| -}
|
| -
|
| void ResourceMessageFilter::OnDnsPrefetch(
|
| const std::vector<std::string>& hostnames) {
|
| chrome_browser_net::DnsPrefetchList(hostnames);
|
|
|