Introduced the URLBlacklistManager, and wired it to various places.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 33 matching lines @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/host_blacklist_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_input_manager.h"
@@ skipping 670 matching lines @@
 
   if (pref_proxy_config_tracker_)
     pref_proxy_config_tracker_->DetachFromPrefService();
 
   if (protocol_handler_registry_)
     protocol_handler_registry_->Finalize();
 
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
+  if (host_blacklist_manager_)
+    host_blacklist_manager_->ShutdownOnUIThread();
+
   // This causes the Preferences file to be written to disk.
   MarkAsCleanShutdown();
 }
 
 std::string ProfileImpl::GetProfileName() {
   return GetPrefs()->GetString(prefs::kGoogleServicesUsername);
 }
 
 FilePath ProfileImpl::GetPath() {
   return path_;
@@ skipping 821 matching lines @@
   return extension_info_map_.get();
 }
 
 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() {
   if (!chrome_url_data_manager_.get())
     chrome_url_data_manager_.reset(new ChromeURLDataManager(
         io_data_.GetChromeURLDataManagerBackendGetter()));
   return chrome_url_data_manager_.get();
 }
 
+policy::HostBlacklistManager* ProfileImpl::GetHostBlacklistManager() {
+#if defined(ENABLE_CONFIGURATION_POLICY)
+  if (!host_blacklist_manager_.get()) {
+    host_blacklist_manager_ = new policy::HostBlacklistManager(this);
+    host_blacklist_manager_->Initialize();
+  }
+#endif
+  return host_blacklist_manager_.get();
+}
+
 PromoCounter* ProfileImpl::GetInstantPromoCounter() {
 #if defined(OS_WIN)
   // TODO: enable this when we're ready to turn on the promo.
   /*
   if (!checked_instant_promo_) {
     checked_instant_promo_ = true;
     PrefService* prefs = GetPrefs();
     if (!prefs->GetBoolean(prefs::kInstantEnabledOnce) &&
         !InstantController::IsEnabled(this) &&
         InstallUtil::IsChromeSxSProcess()) {
@@ skipping 128 matching lines @@
 #endif
   }
   return prerender_manager_.get();
 }
 
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }