HostContentSettingsMap refactoring.

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 719 matching lines @@
 
   if (extension_message_service_)
     extension_message_service_->DestroyingProfile();
 
   if (pref_proxy_config_tracker_)
     pref_proxy_config_tracker_->DetachFromPrefService();
 
   if (protocol_handler_registry_)
     protocol_handler_registry_->Finalize();
 
+  if (cookie_content_settings_)
+    cookie_content_settings_->ShutdownOnUIThread();
+
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
   // This causes the Preferences file to be written to disk.
   MarkAsCleanShutdown();
 }
 
 std::string ProfileImpl::GetProfileName() {
   return GetPrefs()->GetString(prefs::kGoogleServicesUsername);
 }
@@ skipping 75 matching lines @@
 }
 
 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
   return extension_event_router_.get();
 }
 
 ExtensionSpecialStoragePolicy*
     ProfileImpl::GetExtensionSpecialStoragePolicy() {
   if (!extension_special_storage_policy_.get()) {
     extension_special_storage_policy_ =
-        new ExtensionSpecialStoragePolicy(GetHostContentSettingsMap());
+        new ExtensionSpecialStoragePolicy(GetCookieContentSettings());
   }
   return extension_special_storage_policy_.get();
 }
 
 SSLHostState* ProfileImpl::GetSSLHostState() {
   if (!ssl_host_state_.get())
     ssl_host_state_.reset(new SSLHostState());
 
   DCHECK(ssl_host_state_->CalledOnValidThread());
   return ssl_host_state_.get();
@@ skipping 162 matching lines @@
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
   if (!host_content_settings_map_.get()) {
     host_content_settings_map_ = new HostContentSettingsMap(
         GetPrefs(), GetExtensionService(), false);
   }
+  // Create CookieContentSettings, too, since it takes care of migrating

[markusheintz_, 2011/08/24 12:29:40]

Are you sure about this? If you only read cookie settings through the
CookieSettings class then it should not matter. But I guess we can remove this
migration code soon anyway.

[marja, 2011/08/25 13:56:11]

There was a unit test depending on this, and only using HostContentSettingsMap
(never creating CookieSettings). I modified the test to use CookieSettings.
There is no real problem afaik.

+  // preferences to HostContentSettingsMap.
+  if (!cookie_content_settings_.get()) {
+    cookie_content_settings_ = new CookieContentSettings(
+        host_content_settings_map_.get(), GetPrefs(), false);
+  }
   return host_content_settings_map_.get();
 }
 
+CookieContentSettings* ProfileImpl::GetCookieContentSettings() {
+  GetHostContentSettingsMap();
+  return cookie_content_settings_.get();
+}
+
 HostZoomMap* ProfileImpl::GetHostZoomMap() {
   if (!host_zoom_map_) {
     host_zoom_map_ = new HostZoomMap();
     host_zoom_map_->set_default_zoom_level(
         GetPrefs()->GetDouble(prefs::kDefaultZoomLevel));
 
     const DictionaryValue* host_zoom_dictionary =
         prefs_->GetDictionary(prefs::kPerHostZoomLevels);
     // Careful: The returned value could be NULL if the pref has never been set.
     if (host_zoom_dictionary != NULL) {
@@ skipping 690 matching lines @@
 #endif
   }
   return prerender_manager_.get();
 }
 
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }