Don't force non-session only cookies to be session only cookies, instead delete on shutdown

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 9819c3ac711a9b5abb4f2f5d0c71a32180f1ef8a..4ff2f48d44fc517c53516fc859e183cb7750b67c 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -52,6 +52,11 @@ class HostContentSettingsMap
                          ExtensionService* extension_service,
                          bool incognito);
 
+  // In some cases, the ExtensionService is not available at the time the
+  // HostContentSettingsMap is constructed. In these cases, we register the
+  // service once it's available.
+  void RegisterExtensionService(ExtensionService* extension_service);

[jochen (gone - plz use gerrit), 2012/05/24 11:04:03]

Since I create a SpecialStoragePolicy during profile construction now, the host
content settings map is created before the ExtensionSystem is initialized. To
work around this, I added this function to update the HCSM once the extension
system is ready.

+
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the default setting for a particular content type. If |provider_id|