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 1168 matching lines @@
 }
 
 AppCacheStorageImpl::~AppCacheStorageImpl() {
   std::for_each(pending_quota_queries_.begin(),
                 pending_quota_queries_.end(),
                 std::mem_fun(&DatabaseTask::CancelCompletion));
   std::for_each(scheduled_database_tasks_.begin(),
                 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_,
                    make_scoped_refptr(service_->special_storage_policy()),
                    service()->clear_local_state_on_exit()));
   }
 }
 
 void AppCacheStorageImpl::Initialize(const FilePath& cache_directory,
                                      base::MessageLoopProxy* db_thread,
@@ skipping 471 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