Integrate BlacklistManager with Profile.

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/strict_transport_security_persister.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/password_manager/password_store_default.h"
-#include "chrome/browser/privacy_blacklist/blacklist_io.h"
+#include "chrome/browser/privacy_blacklist/blacklist_manager.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_versus_navigate_classifier.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/thumbnail_store.h"
@@ skipping 351 matching lines @@
           ChromeURLRequestContextGetter::CreateOffTheRecordForExtensions(this);
     }
 
     return extensions_request_context_;
   }
 
   virtual net::SSLConfigService* GetSSLConfigService() {
     return GetOriginalProfile()->GetSSLConfigService();
   }
 
-  virtual Blacklist* GetBlacklist() {
-    return GetOriginalProfile()->GetBlacklist();
+  virtual BlacklistManager* GetBlacklistManager() {
+    return GetOriginalProfile()->GetBlacklistManager();
   }
 
   virtual SessionService* GetSessionService() {
     // Don't save any sessions when off the record.
     return NULL;
   }
 
   virtual void ShutdownSessionService() {
     // We don't allow a session service, nothing to do.
   }
@@ skipping 144 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 ProfileImpl::ProfileImpl(const FilePath& path)
     : path_(path),
       visited_link_event_listener_(new VisitedLinkEventListener()),
       extension_devtools_manager_(NULL),
       request_context_(NULL),
       media_request_context_(NULL),
       extensions_request_context_(NULL),
-      blacklist_(NULL),
+      blacklist_manager_(NULL),
+      blacklist_manager_created_(false),
       history_service_created_(false),
       favicon_service_created_(false),
       created_web_data_service_(false),
       created_password_store_(false),
       created_download_manager_(false),
       created_theme_provider_(false),
       start_time_(Time::Now()),
       spellcheck_host_(NULL),
       spellcheck_host_ready_(false),
       shutdown_session_service_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableExtensionTimelineApi)) {
     extension_devtools_manager_ = new ExtensionDevToolsManager(this);
   }
 
   extension_process_manager_.reset(new ExtensionProcessManager(this));
   extension_message_service_ = new ExtensionMessageService(this);
 
   PrefService* prefs = GetPrefs();
   prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this);
   prefs->AddPrefObserver(prefs::kEnableSpellCheck, this);
   prefs->AddPrefObserver(prefs::kEnableAutoSpellCorrect, this);
 
-  if (CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kPrivacyBlacklist)) {
-    std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue(
-        switches::kPrivacyBlacklist);
-#if defined(OS_POSIX)
-    FilePath path(WideToUTF8(option));
-#else
-    FilePath path(option);
-#endif
-    blacklist_.reset(new Blacklist);
-    // TODO(phajdan.jr): Handle errors when reading blacklist.
-    BlacklistIO::ReadBinary(blacklist_.get(), path);
-  }
-
 #if defined(OS_MACOSX)
   // If the profile directory doesn't already have a cache directory and it
   // is under ~/Library/Application Support, use a suitable cache directory
   // under ~/Library/Caches.  For example, a profile directory of
   // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't
   // have a "Cache" or "MediaCache" subdirectory would use the cache directory
   // ~/Library/Caches/Google/Chrome/MyProfileName.
   //
   // TODO(akalin): Come up with unit tests for this.
   // TODO(akalin): Use for Linux, too?
@@ skipping 124 matching lines @@
   if (spellcheck_host_.get())
     spellcheck_host_->UnsetObserver();
 
   if (default_request_context_ == request_context_)
     default_request_context_ = NULL;
 
   CleanupRequestContext(request_context_);
   CleanupRequestContext(media_request_context_);
   CleanupRequestContext(extensions_request_context_);
 
-  // When the request contexts are gone, the blacklist wont be needed anymore.
-  blacklist_.reset();
-
   // HistoryService may call into the BookmarkModel, as such we need to
   // delete HistoryService before the BookmarkModel. The destructor for
   // HistoryService will join with HistoryService's backend thread so that
   // by the time the destructor has finished we're sure it will no longer call
   // into the BookmarkModel.
   history_service_ = NULL;
   bookmark_bar_model_.reset();
 
   // FaviconService depends on HistoryServce so make sure we delete
   // HistoryService first.
@@ skipping 191 matching lines @@
             this, cookie_path);
   }
 
   return extensions_request_context_;
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
-Blacklist* ProfileImpl::GetBlacklist() {
-  return blacklist_.get();
+BlacklistManager* ProfileImpl::GetBlacklistManager() {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnablePrivacyBlacklists)) {
+    return NULL;
+  }
+  if (!blacklist_manager_created_) {
+    blacklist_manager_created_ = true;
+    blacklist_manager_ = new BlacklistManager(this, GetExtensionsService());
+    blacklist_manager_->Initialize();
+  }
+  return blacklist_manager_.get();
 }
 
 HistoryService* ProfileImpl::GetHistoryService(ServiceAccessType sat) {
   if (!history_service_created_) {
     history_service_created_ = true;
     scoped_refptr<HistoryService> history(new HistoryService(this));
     if (!history->Init(GetPath(), GetBookmarkModel()))
       return NULL;
     history_service_.swap(history);
 
@@ skipping 341 matching lines @@
   }
   if (!sync_service_.get())
     InitSyncService();
   return sync_service_.get();
 }
 
 void ProfileImpl::InitSyncService() {
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 }