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

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 156f0770e448d7af14d1d10ebd3b4c827d491763..093ace4fc8be30bc6e60a47918b61826c56c0f6e 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -16,6 +16,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ -647,6 +648,8 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
                                             bool go_off_the_record) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   ExtensionSystem::Get(profile)->Init(!go_off_the_record);
+  profile->GetHostContentSettingsMap()->RegisterExtensionService(
+      ExtensionSystem::Get(profile)->extension_service());
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
 }