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

 // Copyright (c) 2012 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/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 102 matching lines @@
       new content_settings::PrefProvider(prefs_, is_off_the_record_);
   pref_provider->AddObserver(this);
   content_settings_providers_[PREF_PROVIDER] = pref_provider;
 
   content_settings::ObservableProvider* default_provider =
       new content_settings::DefaultProvider(prefs_, is_off_the_record_);
   default_provider->AddObserver(this);
   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,
                              0,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kContentSettingsDefaultWhitelistVersion,
                              0, PrefService::SYNCABLE_PREF);
 
   // Register the prefs for the content settings providers.
   content_settings::DefaultProvider::RegisterUserPrefs(prefs);
@@ skipping 334 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return NULL;
 }