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

content/browser/in_process_webkit/webkit_context.cc

Index: content/browser/in_process_webkit/webkit_context.cc
diff --git a/content/browser/in_process_webkit/webkit_context.cc b/content/browser/in_process_webkit/webkit_context.cc
index b0f25aa21c41017bf06cc00da24b5ee5cfc1bf95..6dfa897c2fc64209e03d57462ed6a8cc6e268eb7 100644
--- a/content/browser/in_process_webkit/webkit_context.cc
+++ b/content/browser/in_process_webkit/webkit_context.cc
@@ -68,27 +68,27 @@ void WebKitContext::DeleteDataModifiedSince(const base::Time& cutoff) {
   dom_storage_context_->DeleteDataModifiedSince(cutoff);
 }
 
-void WebKitContext::DeleteSessionOnlyData() {
+void WebKitContext::DeleteSessionStorageNamespace(
+    int64 session_storage_namespace_id) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)) {
     BrowserThread::PostTask(
         BrowserThread::WEBKIT, FROM_HERE,
-        base::Bind(&WebKitContext::DeleteSessionOnlyData, this));
+        base::Bind(&WebKitContext::DeleteSessionStorageNamespace, this,
+                   session_storage_namespace_id));
     return;
   }
 
-  dom_storage_context_->DeleteSessionOnlyData();
+  dom_storage_context_->DeleteSessionStorageNamespace(
+      session_storage_namespace_id);
 }
 
-void WebKitContext::DeleteSessionStorageNamespace(
-    int64 session_storage_namespace_id) {
+void WebKitContext::SaveSessionState() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)) {
     BrowserThread::PostTask(
         BrowserThread::WEBKIT, FROM_HERE,
-        base::Bind(&WebKitContext::DeleteSessionStorageNamespace, this,
-                   session_storage_namespace_id));
+        base::Bind(&WebKitContext::SaveSessionState, this));
     return;
   }
-
-  dom_storage_context_->DeleteSessionStorageNamespace(
-      session_storage_namespace_id);
+  dom_storage_context_->SaveSessionState();
+  indexed_db_context_->SaveSessionState();
 }