Integrate BlacklistManager with Profile.

chrome/browser/net/chrome_url_request_context.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 
 #include "base/file_path.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/common/appcache/chrome_appcache_service.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_service.h"
 #include "net/url_request/url_request_context.h"
 
 class Blacklist;
+class BlacklistManager;
 class CommandLine;
 class Profile;
 
 namespace net {
 class ProxyConfig;
 }
 
 class ChromeURLRequestContext;
 class ChromeURLRequestContextFactory;
 
@@ skipping 145 matching lines @@
     return extension_paths_;
   }
 
   virtual const std::string& GetUserAgent(const GURL& url) const;
 
   virtual bool InterceptCookie(const URLRequest* request, std::string* cookie);
 
   virtual bool AllowSendingCookies(const URLRequest* request) const;
 
   // Gets the Privacy Blacklist, if any for this context.
-  const Blacklist* blacklist() const { return blacklist_; }
+  const Blacklist* GetBlacklist() const;
 
   // Callback for when new extensions are loaded.
   void OnNewExtensions(const std::string& id, const FilePath& path);
 
   // Callback for when an extension is unloaded.
   void OnUnloadedExtension(const std::string& id);
 
  protected:
   // Copies the dependencies from |other| into |this|. If you use this
   // constructor, then you should hold a reference to |other|, as we
@@ skipping 43 matching lines @@
   }
   void set_is_off_the_record(bool is_off_the_record) {
     is_off_the_record_ = is_off_the_record;
   }
   void set_is_media(bool is_media) {
     is_media_ = is_media;
   }
   void set_extension_paths(const ExtensionPaths& paths) {
     extension_paths_ = paths;
   }
-  void set_blacklist(const Blacklist* blacklist) {
-    blacklist_ = blacklist;
-  }
+  void set_blacklist_manager(BlacklistManager* blacklist_manager);
   void set_appcache_service(ChromeAppCacheService* service) {
     appcache_service_ = service;
   }
 
   // Callback for when the accept language changes.
   void OnAcceptLanguageChange(const std::string& accept_language);
 
   // Callback for when the cookie policy changes.
   void OnCookiePolicyChange(net::CookiePolicy::Type type);
 
   // Callback for when the default charset changes.
   void OnDefaultCharsetChange(const std::string& default_charset);
 
  protected:
   // Maps extension IDs to paths on disk. This is initialized in the
   // construtor and updated when extensions changed.
   ExtensionPaths extension_paths_;
 
   // Path to the directory user scripts are stored in.
   FilePath user_script_dir_path_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
+  scoped_refptr<BlacklistManager> blacklist_manager_;
 
-  const Blacklist* blacklist_;
   bool is_media_;
   bool is_off_the_record_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContext);
 };
 
 // Base class for a ChromeURLRequestContext factory. This includes
 // the shared functionality like extracting the default language/charset
 // from a profile.
@@ skipping 20 matching lines @@
   // NOTE: If you add any parameters here, keep it in sync with
   // ApplyProfileParametersToContext().
   bool is_media_;
   bool is_off_the_record_;
   std::string accept_language_;
   std::string accept_charset_;
   std::string referrer_charset_;
   net::CookiePolicy::Type cookie_policy_type_;
   ChromeURLRequestContext::ExtensionPaths extension_paths_;
   FilePath user_script_dir_path_;
-  Blacklist* blacklist_;
+  scoped_refptr<BlacklistManager> blacklist_manager_;
   net::StrictTransportSecurityState* strict_transport_security_state_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
 
   FilePath profile_dir_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextFactory);
 };
 
 // Creates a proxy configuration using the overrides specified on the command
 // line. Returns NULL if the system defaults should be used instead.
 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line);
 
 #endif  // CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_