Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

chrome/test/testing_profile.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/test/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 156 matching lines @@
 }
 
 TestingProfile::~TestingProfile() {
   NotificationService::current()->Notify(
       NotificationType::PROFILE_DESTROYED,
       Source<Profile>(static_cast<Profile*>(this)),
       NotificationService::NoDetails());
 
   profile_dependency_manager_->DestroyProfileServices(this);
 
+  if (host_content_settings_map_)
+    host_content_settings_map_->ShutdownOnUIThread();
+
   DestroyTopSites();
   DestroyHistoryService();
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
   DestroyWebDataService();
-  if (extension_service_.get()) {
-    extension_service_.reset();
-  }
 
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 }
 
 void TestingProfile::CreateFaviconService() {
   favicon_service_ = NULL;
   favicon_service_ = new FaviconService(this);
 }
 
@@ skipping 408 matching lines @@
   return content::MockResourceContext::GetInstance();
 }
 
 FindBarState* TestingProfile::GetFindBarState() {
   if (!find_bar_state_.get())
     find_bar_state_.reset(new FindBarState());
   return find_bar_state_.get();
 }
 
 HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
-  if (!host_content_settings_map_.get())
-    host_content_settings_map_ = new HostContentSettingsMap(this);
+  if (!host_content_settings_map_.get()) {
+    host_content_settings_map_ = new HostContentSettingsMap(
+        GetPrefs(), GetExtensionService(), false);
+  }
   return host_content_settings_map_.get();
 }
 
 GeolocationContentSettingsMap*
 TestingProfile::GetGeolocationContentSettingsMap() {
   if (!geolocation_content_settings_map_.get()) {
     geolocation_content_settings_map_ =
         new GeolocationContentSettingsMap(this);
   }
   return geolocation_content_settings_map_.get();
@@ skipping 161 matching lines @@
 }
 
 DerivedTestingProfile::DerivedTestingProfile(Profile* profile)
     : original_profile_(profile) {}
 
 DerivedTestingProfile::~DerivedTestingProfile() {}
 
 ProfileId DerivedTestingProfile::GetRuntimeId() {
   return original_profile_->GetRuntimeId();
 }