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

webkit/appcache/appcache_storage_impl.cc

Index: webkit/appcache/appcache_storage_impl.cc
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc
index 78231c160762f8c39cc1d48744dc6fe6c10ae5e8..97ae90654d59b64de7b2f0ed32d09b1895bd5898 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/appcache/appcache_storage_impl.cc
@@ -1186,7 +1186,7 @@ AppCacheStorageImpl::~AppCacheStorageImpl() {
                 scheduled_database_tasks_.end(),
                 std::mem_fun(&DatabaseTask::CancelCompletion));
 
-  if (database_) {
+  if (database_ && !service()->save_session_state()) {

[michaeln, 2011/12/07 20:49:15]

Since CleanUpOnDatabaseThread is also responsible for deleting the db_ instance,
this has to be massages a little to allow that to happen.

[marja, 2011/12/08 08:30:12]

Done.

     db_thread_->PostTask(
         FROM_HERE,
         base::Bind(&CleanUpOnDatabaseThread, database_,