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

webkit/appcache/appcache_storage_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 "webkit/appcache/appcache_storage_impl.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <vector>
@@ skipping 54 matching lines @@
         database->DeleteFallbackNameSpacesForCache(cache_record.cache_id) &&
         database->DeleteOnlineWhiteListForCache(cache_record.cache_id) &&
         database->InsertDeletableResponseIds(*deletable_response_ids);
   } else {
     NOTREACHED() << "A existing group without a cache is unexpected";
     success = database->DeleteGroup(group_id);
   }
   return success;
 }
 
-// Deletes all appcache data (if clear_all_data is true), or session-only
-// appcache data. Also, schedules the database to be destroyed.
+// Destroys |database|. If there is appcache data to be deleted
+// (|save_session_state| is false), deletes all appcache data (if
+// |clear_all_data| is true), or session-only appcache data (otherwise).
 void CleanUpOnDatabaseThread(
     AppCacheDatabase* database,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
-    bool clear_all_appcaches) {
+    bool clear_all_appcaches,
+    bool save_session_state) {
   scoped_ptr<AppCacheDatabase> database_to_delete(database);
 
+  // If saving session state, only delete the database.
+  if (save_session_state)
+    return;
+
   bool has_session_only_appcaches =
       special_storage_policy.get() &&
       special_storage_policy->HasSessionOnlyOrigins();
 
   // Clearning only session-only databases, and there are none.
   if (!clear_all_appcaches && !has_session_only_appcaches)
     return;
 
   std::set<GURL> origins;
   database->FindOriginsWithGroups(&origins);
@@ skipping 1091 matching lines @@
                 std::mem_fun(&DatabaseTask::CancelCompletion));
   std::for_each(scheduled_database_tasks_.begin(),
                 scheduled_database_tasks_.end(),
                 std::mem_fun(&DatabaseTask::CancelCompletion));
 
   if (database_) {
     db_thread_->PostTask(
         FROM_HERE,
         base::Bind(&CleanUpOnDatabaseThread, database_,
                    make_scoped_refptr(service_->special_storage_policy()),
-                   service()->clear_local_state_on_exit()));
+                   service()->clear_local_state_on_exit(),
+                   service()->save_session_state()));
   }
 }
 
 void AppCacheStorageImpl::Initialize(const FilePath& cache_directory,
                                      base::MessageLoopProxy* db_thread,
                                      base::MessageLoopProxy* cache_thread) {
   DCHECK(db_thread);
 
   cache_directory_ = cache_directory;
   is_incognito_ = cache_directory_.empty();
@@ skipping 466 matching lines @@
     Disable();
     if (!is_incognito_) {
       VLOG(1) << "Deleting existing appcache data and starting over.";
       db_thread_->PostTask(
           FROM_HERE, base::Bind(&DeleteDirectory, cache_directory_));
     }
   }
 }
 
 }  // namespace appcache