Integrate BlacklistManager with Profile.

chrome/browser/profile.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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
@@ skipping 13 matching lines @@
 
 namespace net {
 class StrictTransportSecurityState;
 class SSLConfigService;
 }
 
 namespace webkit_database {
 class DatabaseTracker;
 }
 
-class Blacklist;
+class BlacklistManager;
 class BookmarkModel;
 class BrowserThemeProvider;
 class ChromeURLRequestContextGetter;
 class DesktopNotificationService;
 class DownloadManager;
 class Extension;
 class ExtensionDevToolsManager;
 class ExtensionProcessManager;
 class ExtensionMessageService;
 class ExtensionsService;
@@ skipping 234 matching lines @@
   // profile.
   virtual URLRequestContextGetter* GetRequestContextForMedia() = 0;
 
   // Returns the request context used for extension-related requests.  This
   // is only used for a separate cookie store currently.
   virtual URLRequestContextGetter* GetRequestContextForExtensions() = 0;
 
   // Returns the SSLConfigService for this profile.
   virtual net::SSLConfigService* GetSSLConfigService() = 0;
 
-  // Returns the Privacy Blaclist for this profile.
-  virtual Blacklist* GetBlacklist() = 0;
+  // Returns the Privacy Blacklist Manager for this profile.
+  virtual BlacklistManager* GetBlacklistManager() = 0;
 
   // Returns the session service for this profile. This may return NULL. If
   // this profile supports a session service (it isn't off the record), and
   // the session service hasn't yet been created, this forces creation of
   // the session service.
   //
   // This returns NULL in two situations: the profile is off the record, or the
   // session service has been explicitly shutdown (browser is exiting). Callers
   // should always check the return value for NULL.
   virtual SessionService* GetSessionService() = 0;
@@ skipping 130 matching lines @@
   virtual void SetNativeTheme();
   virtual void ClearTheme();
   virtual Extension* GetTheme();
   virtual ThemeProvider* GetThemeProvider();
   virtual ThumbnailStore* GetThumbnailStore();
   virtual bool HasCreatedDownloadManager() const;
   virtual URLRequestContextGetter* GetRequestContext();
   virtual URLRequestContextGetter* GetRequestContextForMedia();
   virtual URLRequestContextGetter* GetRequestContextForExtensions();
   virtual net::SSLConfigService* GetSSLConfigService();
-  virtual Blacklist* GetBlacklist();
+  virtual BlacklistManager* GetBlacklistManager();
   virtual SessionService* GetSessionService();
   virtual void ShutdownSessionService();
   virtual bool HasSessionService() const;
   virtual std::wstring GetName();
   virtual void SetName(const std::wstring& name);
   virtual std::wstring GetID();
   virtual void SetID(const std::wstring& id);
   virtual bool DidLastSessionExitCleanly();
   virtual BookmarkModel* GetBookmarkModel();
   virtual bool IsSameProfile(Profile* profile);
@@ skipping 66 matching lines @@
   scoped_ptr<ProfileSyncService> sync_service_;
 
   scoped_refptr<ChromeURLRequestContextGetter> request_context_;
 
   scoped_refptr<ChromeURLRequestContextGetter> media_request_context_;
 
   scoped_refptr<ChromeURLRequestContextGetter> extensions_request_context_;
 
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
 
-  scoped_ptr<Blacklist> blacklist_;
-
+  scoped_refptr<BlacklistManager> blacklist_manager_;
   scoped_refptr<DownloadManager> download_manager_;
   scoped_refptr<HistoryService> history_service_;
   scoped_refptr<FaviconService> favicon_service_;
   scoped_ptr<SearchVersusNavigateClassifier> search_versus_navigate_classifier_;
   scoped_refptr<WebDataService> web_data_service_;
   scoped_refptr<PasswordStore> password_store_;
   scoped_refptr<SessionService> session_service_;
   scoped_ptr<BrowserThemeProvider> theme_provider_;
   scoped_refptr<WebKitContext> webkit_context_;
   scoped_ptr<DesktopNotificationService> desktop_notification_service_;
   scoped_ptr<PersonalDataManager> personal_data_manager_;
+  bool blacklist_manager_created_;
   bool history_service_created_;
   bool favicon_service_created_;
   bool created_web_data_service_;
   bool created_password_store_;
   bool created_download_manager_;
   bool created_theme_provider_;
   // Whether or not the last session exited cleanly. This is set only once.
   bool last_session_exited_cleanly_;
 
   base::OneShotTimer<ProfileImpl> create_session_service_timer_;
@@ skipping 20 matching lines @@
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
 #if defined(OS_CHROMEOS)
   chromeos::Preferences chromeos_preferences_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_H_