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

chrome/browser/profiles/profile_impl_io_data.h

Index: chrome/browser/profiles/profile_impl_io_data.h
diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
index 153e2784821f675054197c49ce510562cd6f371e..c7b4d1eb300268567eb737c16d47dc12bd14df5c 100644
--- a/chrome/browser/profiles/profile_impl_io_data.h
+++ b/chrome/browser/profiles/profile_impl_io_data.h
@@ -21,6 +21,10 @@ class HttpServerProperties;
 class HttpTransactionFactory;
 }  // namespace net
 
+namespace quota {
+class SpecialStoragePolicy;
+}  // namespace quota
+
 class ProfileImplIOData : public ProfileIOData {
  public:
   class Handle {
@@ -45,7 +49,8 @@ class ProfileImplIOData : public ProfileIOData {
               chrome_browser_net::Predictor* predictor,
               PrefService* local_state,
               IOThread* io_thread,
-              bool restore_old_session_cookies);
+              bool restore_old_session_cookies,
+              quota::SpecialStoragePolicy* special_storage_policy);
 
     base::Callback<ChromeURLDataManagerBackend*(void)>
         GetChromeURLDataManagerBackendGetter() const;
@@ -115,6 +120,7 @@ class ProfileImplIOData : public ProfileIOData {
     int media_cache_max_size;
     FilePath extensions_cookie_path;
     bool restore_old_session_cookies;
+    scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy;
   };
 
   typedef base::hash_map<std::string, net::HttpTransactionFactory* >