Appcache, local storage, indexed db, databases: skip exit-time deletion when restarting.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 151 matching lines @@
 
 FilePath GetCachePath(const FilePath& base) {
   return base.Append(chrome::kCacheDirname);
 }
 
 FilePath GetMediaCachePath(const FilePath& base) {
   return base.Append(chrome::kMediaCacheDirname);
 }
 
 void SaveSessionStateOnIOThread(
-    net::URLRequestContextGetter* url_request_context_getter) {
+    net::URLRequestContextGetter* url_request_context_getter,
+    ChromeAppCacheService* appcache_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   url_request_context_getter->GetURLRequestContext()->cookie_store()->
       GetCookieMonster()->SaveSessionCookies();
+  if (appcache_service)
+    appcache_service->set_save_session_state(true);
 }
 
 }  // namespace
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   if (!file_util::PathExists(path)) {
     // TODO(tc): http://b/1094718 Bad things happen if we can't write to the
     // profile directory.  We should eventually be able to run in this
     // situation.
@@ skipping 318 matching lines @@
       content::Source<Profile>(this),
       content::NotificationService::NoDetails());
 
   if (appcache_service_ && clear_local_state_on_exit_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&appcache::AppCacheService::set_clear_local_state_on_exit,
                    appcache_service_.get(), true));
   }
 
-  if (webkit_context_.get())
-    webkit_context_->DeleteSessionOnlyData();
-
   StopCreateSessionServiceTimer();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
   // The sync service needs to be deleted before the services it calls.
   // TODO(stevet): Make ProfileSyncService into a PKS and let the PDM take care
   // of the cleanup below.
   sync_service_.reset();
 
@@ skipping 1050 matching lines @@
 
 NetworkActionPredictor* ProfileImpl::GetNetworkActionPredictor() {
   if (!network_action_predictor_.get())
     network_action_predictor_.reset(new NetworkActionPredictor(this));
   return network_action_predictor_.get();
 }
 
 void ProfileImpl::SaveSessionState() {
   if (!session_restore_enabled_)
     return;
+  if (webkit_context_.get())
+    webkit_context_->SaveSessionState();
+  if (db_tracker_.get())
+    db_tracker_->SaveSessionState();
+
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SaveSessionStateOnIOThread,
-                 make_scoped_refptr(GetRequestContext())));
+                 make_scoped_refptr(GetRequestContext()),
+                 make_scoped_refptr(appcache_service_.get())));
 }
 
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile(path_));
   return spellcheck_profile_.get();
 }
 
 void ProfileImpl::UpdateProfileUserNameCache() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ skipping 15 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }