Adding CookieSettings for storing cookie content settings.

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 9787647ba2fe8252e300c365e9624ac0eae8ba52..9af7f84ca29d126e9bbf729622e5a9e186b50918 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -23,6 +23,7 @@
 class CommandLine;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
+class CookieSettings;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
@@ -101,6 +102,7 @@ class ProfileIOData {
   // that profile.
   ExtensionInfoMap* GetExtensionInfoMap() const;
   HostContentSettingsMap* GetHostContentSettingsMap() const;
+  CookieSettings* GetCookieSettings() const;

[Bernhard Bauer, 2011/10/25 13:14:23]

Where is this method actually called?

[marja, 2011/10/26 13:03:21]

This should've been called by ContentSettingsHandler; I fixed it so that it
really does call it.

[Bernhard Bauer, 2011/10/26 13:24:09]

Does it? ContentSettingsHandler seems to get the CookieSettings from the Profile
(as it lives on the UI thread anyway). I think this method here is unnecessary.

[marja, 2011/10/27 08:48:51]

Oops, not ContentSettingsHandler. This one is called by
ChromeWorkerMessageFilter, and it used to get the HostContentSettingsMap the
same way when it used it.

[Bernhard Bauer, 2011/10/27 09:27:05]

Ah, OK then.

   DesktopNotificationService* GetNotificationService() const;
 
   BooleanPrefMember* clear_local_state_on_exit()  const {
@@ -147,6 +149,7 @@ class ProfileIOData {
     std::string referrer_charset;
     IOThread* io_thread;
     scoped_refptr<HostContentSettingsMap> host_content_settings_map;
+    scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<HostZoomMap> host_zoom_map;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
@@ -300,6 +303,7 @@ class ProfileIOData {
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
+  mutable scoped_refptr<CookieSettings> cookie_settings_;
   mutable DesktopNotificationService* notification_service_;
 
   mutable ResourceContext resource_context_;