1 files changed, 0 insertions, 22 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 2b6d08d..6964460 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -17,7 +17,6 @@
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/pref_service.h"
-#include "chrome/browser/privacy_blacklist/blacklist.h"
 #include "chrome/browser/net/chrome_cookie_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/net/url_request_context_getter.h"
@@ -107,23 +106,12 @@ class ChromeURLRequestContext : public URLRequestContext {
 
   virtual const std::string& GetUserAgent(const GURL& url) const;
 
-  // Returns true if cookies can be added to request.
-  virtual bool InterceptRequestCookies(const URLRequest* request,
-                                       const std::string& cookie) const;
-
-  // Returns true if response cookies should be stored.
-  virtual bool InterceptResponseCookie(const URLRequest* request,
-                                       const std::string& cookie) const;
-
   HostContentSettingsMap* host_content_settings_map() {
     return host_content_settings_map_;
   }
 
   const HostZoomMap* host_zoom_map() const { return host_zoom_map_; }
 
-  // Gets the Privacy Blacklist, if any for this context.
-  const Blacklist* GetPrivacyBlacklist() const;
-
   // Callback for when new extensions are loaded. Takes ownership of
   // |extension_info|.
   void OnNewExtensions(const std::string& id, ExtensionInfo* extension_info);
@@ -208,9 +196,6 @@ class ChromeURLRequestContext : public URLRequestContext {
   void set_host_zoom_map(HostZoomMap* host_zoom_map) {
     host_zoom_map_ = host_zoom_map;
   }
-  void set_privacy_blacklist(Blacklist* privacy_blacklist) {
-    privacy_blacklist_ = privacy_blacklist;
-  }
   void set_appcache_service(ChromeAppCacheService* service) {
     appcache_service_ = service;
   }
@@ -242,17 +227,11 @@ class ChromeURLRequestContext : public URLRequestContext {
   scoped_refptr<ChromeCookiePolicy> chrome_cookie_policy_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
-  scoped_refptr<Blacklist> privacy_blacklist_;
 
   bool is_media_;
   bool is_off_the_record_;
 
  private:
-  // Blacklist implementation of InterceptRequestCookie and
-  // InterceptResponseCookie. Returns true if cookies are allowed and false
-  // if the request matches a Blacklist rule and cookies should be blocked.
-  bool InterceptCookie(const URLRequest* request,
-                       const std::string& cookie) const;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContext);
 };
@@ -406,7 +385,6 @@ class ChromeURLRequestContextFactory {
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
-  scoped_refptr<Blacklist> privacy_blacklist_;
   scoped_refptr<net::TransportSecurityState> transport_security_state_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate_;