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

chrome/browser/content_settings/host_content_settings_map.cc

Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index c9da6a390f8ea67b77ffe35304b6e3f7c5225691..aea66337c7ed253dc6fc9b1bce979ad6298b9e18 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -120,6 +120,30 @@ HostContentSettingsMap::HostContentSettingsMap(
   content_settings_providers_[DEFAULT_PROVIDER] = default_provider;
 }
 
+void HostContentSettingsMap::RegisterExtensionService(
+    ExtensionService* extension_service) {
+  DCHECK(extension_service);
+  DCHECK(!content_settings_providers_[PLATFORM_APP_PROVIDER]);
+  DCHECK(!content_settings_providers_[EXTENSION_PROVIDER]);
+
+  content_settings::PlatformAppProvider* platform_app_provider =
+      new content_settings::PlatformAppProvider(extension_service);
+  platform_app_provider->AddObserver(this);
+  content_settings_providers_[PLATFORM_APP_PROVIDER] = platform_app_provider;
+
+  content_settings::ObservableProvider* extension_provider =
+      new content_settings::ExtensionProvider(
+          extension_service->GetContentSettingsStore(),
+          is_off_the_record_);
+  extension_provider->AddObserver(this);
+  content_settings_providers_[EXTENSION_PROVIDER] = extension_provider;
+
+  OnContentSettingChanged(ContentSettingsPattern(),
+                          ContentSettingsPattern(),
+                          CONTENT_SETTINGS_TYPE_DEFAULT,
+                          "");
+}
+
 // static
 void HostContentSettingsMap::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex,