Don't pass URLBlacklistManager from UI to IO through ProfileParams on ProfileIOData.

chrome/browser/profiles/profile_io_data.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_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 171 matching lines @@
     const base::Callback<Profile*(void)>& profile_getter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Profile* profile = profile_getter.Run();
   if (profile)
     return profile->GetPrerenderManager();
   return NULL;
 }
 
 }  // namespace
 
-void ProfileIOData::InitializeProfileParams(Profile* profile) {
+void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* pref_service = profile->GetPrefs();
 
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->is_incognito = profile->IsOffTheRecord();
   params->clear_local_state_on_exit =
       pref_service->GetBoolean(prefs::kClearSiteDataOnExit);
 
   params->appcache_service = profile->GetAppCacheService();
 
@@ skipping 34 matching lines @@
   params->blob_storage_context = profile->GetBlobStorageContext();
   params->file_system_context = profile->GetFileSystemContext();
   params->quota_manager = profile->GetQuotaManager();
   params->extension_info_map = profile->GetExtensionInfoMap();
   params->notification_service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
   params->prerender_manager_getter =
       base::Bind(&GetPrerenderManagerOnUI, profile_getter);
   params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-  params->url_blacklist_manager.reset(
-      new policy::URLBlacklistManager(pref_service));
-#endif
-
   params->proxy_config_service.reset(
       ProxyServiceFactory::CreateProxyConfigService(
           profile->GetProxyConfigTracker()));
   params->profile = profile;
   profile_params_.reset(params.release());
+
+  // The URLBlacklistManager has to be created on the UI thread to register
+  // observers of |pref_service|, and it also has to clean up on
+  // ShutdownOnUIThread to release these observers on the right thread.
+  // Don't pass it in |profile_params_| to make sure it is correctly cleaned up,
+  // in particular when this ProfileIOData isn't |initialized_| during deletion.
+#if defined(ENABLE_CONFIGURATION_POLICY)
+  url_blacklist_manager_.reset(new policy::URLBlacklistManager(pref_service));
+#endif
 }
 
 ProfileIOData::AppRequestContext::AppRequestContext() {}
 ProfileIOData::AppRequestContext::~AppRequestContext() {}
 
 void ProfileIOData::AppRequestContext::SetCookieStore(
     net::CookieStore* cookie_store) {
   cookie_store_ = cookie_store;
   set_cookie_store(cookie_store);
 }
@@ skipping 136 matching lines @@
   main_request_context_ = new ChromeURLRequestContext;
   extensions_request_context_ = new ChromeURLRequestContext;
 
   profile_params_->appcache_service->set_request_context(main_request_context_);
 
   chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend);
 
   network_delegate_.reset(new ChromeNetworkDelegate(
         io_thread_globals->extension_event_router_forwarder.get(),
         profile_params_->extension_info_map,
-        profile_params_->url_blacklist_manager.get(),
+        url_blacklist_manager_.get(),
         profile_params_->profile,
         &enable_referrers_));
 
   dns_cert_checker_.reset(
       CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(),
                                      main_request_context_));
 
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
@@ skipping 49 matching lines @@
   database_tracker_ = profile_params_->database_tracker;
   appcache_service_ = profile_params_->appcache_service;
   blob_storage_context_ = profile_params_->blob_storage_context;
   file_system_context_ = profile_params_->file_system_context;
   quota_manager_ = profile_params_->quota_manager;
   host_zoom_map_ = profile_params_->host_zoom_map;
   host_content_settings_map_ = profile_params_->host_content_settings_map;
   notification_service_ = profile_params_->notification_service;
   extension_info_map_ = profile_params_->extension_info_map;
   prerender_manager_getter_ = profile_params_->prerender_manager_getter;
-  url_blacklist_manager_.swap(profile_params_->url_blacklist_manager);
 
   resource_context_.set_host_resolver(io_thread_globals->host_resolver.get());
   resource_context_.set_request_context(main_request_context_);
   resource_context_.set_database_tracker(database_tracker_);
   resource_context_.set_appcache_service(appcache_service_);
   resource_context_.set_blob_storage_context(blob_storage_context_);
   resource_context_.set_file_system_context(file_system_context_);
   resource_context_.set_quota_manager(quota_manager_);
   resource_context_.set_host_zoom_map(host_zoom_map_);
   resource_context_.set_prerender_manager_getter(prerender_manager_getter_);
@@ skipping 36 matching lines @@
   bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                         new DeleteTask<ProfileIOData>(this));
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_origin_bound_cert_service(
     net::OriginBoundCertService* origin_bound_cert_service) const {
   origin_bound_cert_service_.reset(origin_bound_cert_service);
 }