Unwire the clear on exit preference from the storage systems.

webkit/appcache/appcache_storage_impl.cc

 // Copyright (c) 2012 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 57 matching lines @@
         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;
 }
 
 // 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(
+// (|force_keep_session_state| is false), deletes session-only appcache data.
+void ClearSessionOnlyOrigins(
     AppCacheDatabase* database,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
-    bool clear_all_appcaches,
-    bool save_session_state) {
+    bool force_keep_session_state) {
   scoped_ptr<AppCacheDatabase> database_to_delete(database);
 
   // If saving session state, only delete the database.
-  if (save_session_state)
+  if (force_keep_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)
+  if (!has_session_only_appcaches)
     return;
 
   std::set<GURL> origins;
   database->FindOriginsWithGroups(&origins);
   if (origins.empty())
     return;  // nothing to delete
 
   sql::Connection* connection = database->db_connection();
   if (!connection) {
     NOTREACHED() << "Missing database connection.";
     return;
   }
 
   std::set<GURL>::const_iterator origin;
   for (origin = origins.begin(); origin != origins.end(); ++origin) {
-    if (!clear_all_appcaches &&
-        !special_storage_policy->IsStorageSessionOnly(*origin))
+    if (!special_storage_policy->IsStorageSessionOnly(*origin))
       continue;
     if (special_storage_policy &&
         special_storage_policy->IsStorageProtected(*origin))
       continue;
 
     std::vector<AppCacheDatabase::GroupRecord> groups;
     database->FindGroupsForOrigin(*origin, &groups);
     std::vector<AppCacheDatabase::GroupRecord>::const_iterator group;
     for (group = groups.begin(); group != groups.end(); ++group) {
       sql::Transaction transaction(connection);
@@ skipping 1184 matching lines @@
   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_ &&
       !db_thread_->PostTask(
           FROM_HERE,
-          base::Bind(&CleanUpOnDatabaseThread, database_,
+          base::Bind(&ClearSessionOnlyOrigins, database_,
                      make_scoped_refptr(service_->special_storage_policy()),
-                     service()->clear_local_state_on_exit(),
-                     service()->save_session_state()))) {
+                     service()->force_keep_session_state()))) {
     delete database_;
   }
 }
 
 void AppCacheStorageImpl::Initialize(const FilePath& cache_directory,
                                      base::MessageLoopProxy* db_thread,
                                      base::MessageLoopProxy* cache_thread) {
   DCHECK(db_thread);
 
   cache_directory_ = cache_directory;
@@ skipping 481 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