Remove abonded privacy blacklist implementation.

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/net/predictor_api.h"
-#include "chrome/browser/privacy_blacklist/blacklist.h"
-#include "chrome/browser/privacy_blacklist/blacklist_request_info.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/static_cookie_policy.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
@@ skipping 775 matching lines @@
   return std::find(api_permissions.begin(),
                    api_permissions.end(),
                    permission_name) != api_permissions.end();
 }
 
 const std::string& ChromeURLRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }
 
-bool ChromeURLRequestContext::InterceptRequestCookies(
-    const URLRequest* request, const std::string& cookies) const {
-  return InterceptCookie(request, cookies);
-}
-
-bool ChromeURLRequestContext::InterceptResponseCookie(
-    const URLRequest* request, const std::string& cookie) const {
-  return InterceptCookie(request, cookie);
-}
-
-bool ChromeURLRequestContext::InterceptCookie(
-    const URLRequest* request, const std::string& cookie) const {
-  BlacklistRequestInfo* request_info =
-      BlacklistRequestInfo::FromURLRequest(request);
-  // Requests which don't go through ResourceDispatcherHost don't have privacy
-  // blacklist request data.
-  if (!request_info)
-    return true;
-  const Blacklist* blacklist = request_info->GetBlacklist();
-  // TODO(phajdan.jr): remove the NULL check when blacklists are stable.
-  if (!blacklist)
-    return true;
-  scoped_ptr<Blacklist::Match> match(blacklist->FindMatch(request->url()));
-  if (match.get() && (match->attributes() & Blacklist::kBlockCookies)) {
-    NotificationService::current()->Notify(
-        NotificationType::BLACKLIST_NONVISUAL_RESOURCE_BLOCKED,
-        Source<const ChromeURLRequestContext>(this),
-        Details<const URLRequest>(request));
-    return false;
-  }
-
-  return true;
-}
-
-const Blacklist* ChromeURLRequestContext::GetPrivacyBlacklist() const {
-  return privacy_blacklist_.get();
-}
-
 void ChromeURLRequestContext::OnNewExtensions(const std::string& id,
                                               ExtensionInfo* info) {
   if (!is_off_the_record_)
     extension_info_[id] = linked_ptr<ExtensionInfo>(info);
 }
 
 void ChromeURLRequestContext::OnUnloadedExtension(const std::string& id) {
   CheckCurrentlyOnIOThread();
   if (is_off_the_record_)
     return;
@@ skipping 35 matching lines @@
   http_auth_handler_factory_ = other->http_auth_handler_factory_;
 
   // Set ChromeURLRequestContext members
   extension_info_ = other->extension_info_;
   user_script_dir_path_ = other->user_script_dir_path_;
   appcache_service_ = other->appcache_service_;
   database_tracker_ = other->database_tracker_;
   chrome_cookie_policy_ = other->chrome_cookie_policy_;
   host_content_settings_map_ = other->host_content_settings_map_;
   host_zoom_map_ = other->host_zoom_map_;
-  privacy_blacklist_ = other->privacy_blacklist_;
   is_media_ = other->is_media_;
   is_off_the_record_ = other->is_off_the_record_;
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(
     const std::string& accept_language) {
   CheckCurrentlyOnIOThread();
   accept_language_ =
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language);
 }
@@ skipping 37 matching lines @@
   // types a URL in the omnibar or click on a download link in a page.
   // For the latter, we need a change on the webkit-side.
   // We initialize it to the default charset here and a user will
   // have an *arguably* better default charset for interpreting a raw 8bit
   // C-D header field.  It means the native OS codepage fallback in
   // net_util::GetSuggestedFilename is unlikely to be taken.
   referrer_charset_ = default_charset;
 
   host_content_settings_map_ = profile->GetHostContentSettingsMap();
   host_zoom_map_ = profile->GetHostZoomMap();
-  privacy_blacklist_ = profile->GetPrivacyBlacklist();
   transport_security_state_ = profile->GetTransportSecurityState();
 
   if (profile->GetExtensionsService()) {
     const ExtensionList* extensions =
         profile->GetExtensionsService()->extensions();
     for (ExtensionList::const_iterator iter = extensions->begin();
         iter != extensions->end(); ++iter) {
       extension_info_[(*iter)->id()] =
           linked_ptr<ChromeURLRequestContext::ExtensionInfo>(
               new ChromeURLRequestContext::ExtensionInfo(
@@ skipping 27 matching lines @@
   // ChromeURLRequestContextFactory(Profile*).
   context->set_is_media(is_media_);
   context->set_is_off_the_record(is_off_the_record_);
   context->set_accept_language(accept_language_);
   context->set_accept_charset(accept_charset_);
   context->set_referrer_charset(referrer_charset_);
   context->set_extension_info(extension_info_);
   context->set_user_script_dir_path(user_script_dir_path_);
   context->set_host_content_settings_map(host_content_settings_map_);
   context->set_host_zoom_map(host_zoom_map_);
-  context->set_privacy_blacklist(privacy_blacklist_);
   context->set_transport_security_state(
       transport_security_state_);
   context->set_ssl_config_service(ssl_config_service_);
   context->set_database_tracker(database_tracker_);
 }
 
 // ----------------------------------------------------------------------------
 
 net::ProxyConfig* CreateProxyConfig(const PrefService* pref_service) {
   // Scan for all "enable" type proxy switches.
@@ skipping 38 matching lines @@
       prefs::kProxyAutoDetect));
 
   if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {
     std::string proxy_bypass =
         pref_service->GetString(prefs::kProxyBypassList);
     proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
   }
 
   return proxy_config;
 }