Unwire the clear on exit preference from the storage systems.

content/browser/in_process_webkit/indexed_db_context_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 "content/browser/in_process_webkit/indexed_db_context_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
       WebKit::WebString origin_id_webstring =
           webkit_glue::FilePathToWebString(file_path.BaseName());
       origins->push_back(
           DatabaseUtil::GetOriginFromIdentifier(origin_id_webstring));
       if (file_paths)
         file_paths->push_back(file_path);
     }
   }
 }
 
-// If clear_all_databases is true, deletes all databases not protected by
-// special storage policy. Otherwise deletes session-only databases.
-void ClearLocalState(
+// Deletes session-only databases.
+void ClearSessionOnlyOrigins(
     const FilePath& indexeddb_path,
-    bool clear_all_databases,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   std::vector<GURL> origins;
   std::vector<FilePath> file_paths;
   GetAllOriginsAndPaths(indexeddb_path, &origins, &file_paths);
   DCHECK_EQ(origins.size(), file_paths.size());
   std::vector<FilePath>::const_iterator file_path_iter = file_paths.begin();
   for (std::vector<GURL>::const_iterator iter = origins.begin();
        iter != origins.end(); ++iter, ++file_path_iter) {
-    if (!clear_all_databases &&
-        !special_storage_policy->IsStorageSessionOnly(*iter)) {
+    if (!special_storage_policy->IsStorageSessionOnly(*iter))
       continue;
-    }
-    if (special_storage_policy.get() &&
-        special_storage_policy->IsStorageProtected(*iter))
+    if (special_storage_policy->IsStorageProtected(*iter))
       continue;
     file_util::Delete(*file_path_iter, true);
   }
 }
 
 }  // namespace
 
 IndexedDBContextImpl::IndexedDBContextImpl(
     const FilePath& data_path,
     quota::SpecialStoragePolicy* special_storage_policy,
     quota::QuotaManagerProxy* quota_manager_proxy,
     base::MessageLoopProxy* webkit_thread_loop)
-    : clear_local_state_on_exit_(false),
-      save_session_state_(false),
+    : force_keep_session_state_(false),
       special_storage_policy_(special_storage_policy),
       quota_manager_proxy_(quota_manager_proxy) {
   if (!data_path.empty())
     data_path_ = data_path.Append(kIndexedDBDirectory);
   if (quota_manager_proxy &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) {
     quota_manager_proxy->RegisterClient(
         new IndexedDBQuotaClient(webkit_thread_loop, this));
   }
 }
@@ skipping 122 matching lines @@
   WebKit::WebIDBFactory* factory = idb_factory_.release();
   if (factory) {
     if (!BrowserThread::DeleteSoon(BrowserThread::WEBKIT_DEPRECATED,
                                    FROM_HERE, factory))
       delete factory;
   }
 
   if (data_path_.empty())
     return;
 
-  if (save_session_state_)
+  if (force_keep_session_state_)
     return;
 
   bool has_session_only_databases =
       special_storage_policy_.get() &&
       special_storage_policy_->HasSessionOnlyOrigins();
 
   // Clearning only session-only databases, and there are none.
-  if (!clear_local_state_on_exit_ && !has_session_only_databases)
+  if (!has_session_only_databases)
     return;
 
   // No WEBKIT thread here means we are running in a unit test where no clean
   // up is needed.
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
-      base::Bind(&ClearLocalState, data_path_, clear_local_state_on_exit_,
+      base::Bind(&ClearSessionOnlyOrigins,
+                 data_path_,
                  special_storage_policy_));
 }
 
 FilePath IndexedDBContextImpl::GetIndexedDBFilePath(
     const string16& origin_id) const {
   DCHECK(!data_path_.empty());
   FilePath::StringType id =
       webkit_glue::WebStringToFilePathString(origin_id).append(
           FILE_PATH_LITERAL(".indexeddb"));
   return data_path_.Append(id.append(kIndexedDBExtension));
@@ skipping 82 matching lines @@
     }
   }
   return origin_set_.get();
 }
 
 void IndexedDBContextImpl::ResetCaches() {
   origin_set_.reset();
   origin_size_map_.clear();
   space_available_map_.clear();
 }