Index: chrome/test/testing_profile.cc |
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc |
index 679cc020494ba3e7c4ba4efd50d6345fed1c8408..552358b9f365dae13695c989f6df8f3e58791f4a 100644 |
--- a/chrome/test/testing_profile.cc |
+++ b/chrome/test/testing_profile.cc |
@@ -174,14 +174,14 @@ TestingProfile::~TestingProfile() { |
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(); |
@@ -610,8 +610,10 @@ FindBarState* TestingProfile::GetFindBarState() { |
} |
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(); |
} |