Unwire the clear on exit preference from the storage systems.

chrome/browser/net/sqlite_server_bound_cert_store.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 "chrome/browser/net/sqlite_server_bound_cert_store.h"
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 
 // This class is designed to be shared between any calling threads and the
 // database thread.  It batches operations and commits them on a timer.
 class SQLiteServerBoundCertStore::Backend
     : public base::RefCountedThreadSafe<SQLiteServerBoundCertStore::Backend> {
  public:
   Backend(const FilePath& path, ClearOnExitPolicy* clear_on_exit_policy)
       : path_(path),
         db_(NULL),
         num_pending_(0),
-        clear_local_state_on_exit_(false),
+        save_session_state_(false),
         clear_on_exit_policy_(clear_on_exit_policy) {
   }
 
   // Creates or load the SQLite database.
   bool Load(
       std::vector<net::DefaultServerBoundCertStore::ServerBoundCert*>* certs);
 
   // Batch a server bound cert addition.
   void AddServerBoundCert(
       const net::DefaultServerBoundCertStore::ServerBoundCert& cert);
 
   // Batch a server bound cert deletion.
   void DeleteServerBoundCert(
       const net::DefaultServerBoundCertStore::ServerBoundCert& cert);
 
   // Commit pending operations as soon as possible.
   void Flush(const base::Closure& completion_task);
 
   // Commit any pending operations and close the database.  This must be called
   // before the object is destructed.
   void Close();
 
-  void SetClearLocalStateOnExit(bool clear_local_state);
+  void SaveSessionState();
 
  private:
   friend class base::RefCountedThreadSafe<SQLiteServerBoundCertStore::Backend>;
 
   // You should call Close() before destructing this object.
   ~Backend() {
     DCHECK(!db_.get()) << "Close should have already been called.";
     DCHECK(num_pending_ == 0 && pending_.empty());
   }
 
@@ skipping 34 matching lines @@
 
   void DeleteCertificatesOnShutdown();
 
   FilePath path_;
   scoped_ptr<sql::Connection> db_;
   sql::MetaTable meta_table_;
 
   typedef std::list<PendingOperation*> PendingOperationsList;
   PendingOperationsList pending_;
   PendingOperationsList::size_type num_pending_;
-  // True if the persistent store should be deleted upon destruction.
-  bool clear_local_state_on_exit_;
-  // Guard |pending_|, |num_pending_| and |clear_local_state_on_exit_|.
+  // True if the persistent store should skip clear on exit rules.
+  bool save_session_state_;

[mattm, 2012/05/31 21:57:12]

This variable name (and function that sets it) is kind of misleading,  Maybe
something like override_clear_on_exit_ or force_save_session_state_on_exit_ ?

+  // Guard |pending_|, |num_pending_| and |save_session_state_|.
   base::Lock lock_;
 
   scoped_refptr<ClearOnExitPolicy> clear_on_exit_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(Backend);
 };
 
 // Version number of the database.
 static const int kCurrentVersionNumber = 4;
 static const int kCompatibleVersionNumber = 1;
@@ skipping 333 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&Backend::InternalBackgroundClose, this));
 }
 
 void SQLiteServerBoundCertStore::Backend::InternalBackgroundClose() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   // Commit any pending operations
   Commit();
 
-  if (!clear_local_state_on_exit_ && clear_on_exit_policy_.get() &&
+  if (!save_session_state_ && clear_on_exit_policy_.get() &&
       clear_on_exit_policy_->HasClearOnExitOrigins()) {
     DeleteCertificatesOnShutdown();
   }
 
   db_.reset();
-
-  if (clear_local_state_on_exit_)
-    file_util::Delete(path_, false);
 }
 
 void SQLiteServerBoundCertStore::Backend::DeleteCertificatesOnShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!db_.get())
     return;
 
   sql::Statement select_smt(db_->GetCachedStatement(
       SQL_FROM_HERE, "SELECT origin FROM origin_bound_certs"));
@@ skipping 30 matching lines @@
     del_smt.Reset(true);
     del_smt.BindString(0, origins_to_delete[i]);
     if (!del_smt.Run())
       NOTREACHED() << "Could not delete a certificate from the DB.";
   }
 
   if (!transaction.Commit())
     LOG(WARNING) << "Unable to delete certificates on shutdown.";
 }
 
-void SQLiteServerBoundCertStore::Backend::SetClearLocalStateOnExit(
-    bool clear_local_state) {
+void SQLiteServerBoundCertStore::Backend::SaveSessionState() {
   base::AutoLock locked(lock_);
-  clear_local_state_on_exit_ = clear_local_state;
+  save_session_state_ = true;
 }
 
 SQLiteServerBoundCertStore::SQLiteServerBoundCertStore(
     const FilePath& path,
     ClearOnExitPolicy* clear_on_exit_policy)
     : backend_(new Backend(path, clear_on_exit_policy)) {
 }
 
 bool SQLiteServerBoundCertStore::Load(
     std::vector<net::DefaultServerBoundCertStore::ServerBoundCert*>* certs) {
   return backend_->Load(certs);
 }
 
 void SQLiteServerBoundCertStore::AddServerBoundCert(
     const net::DefaultServerBoundCertStore::ServerBoundCert& cert) {
   if (backend_.get())
     backend_->AddServerBoundCert(cert);
 }
 
 void SQLiteServerBoundCertStore::DeleteServerBoundCert(
     const net::DefaultServerBoundCertStore::ServerBoundCert& cert) {
   if (backend_.get())
     backend_->DeleteServerBoundCert(cert);
 }
 
-void SQLiteServerBoundCertStore::SetClearLocalStateOnExit(
-    bool clear_local_state) {
+void SQLiteServerBoundCertStore::SaveSessionState() {
   if (backend_.get())
-    backend_->SetClearLocalStateOnExit(clear_local_state);
+    backend_->SaveSessionState();
 }
 
 void SQLiteServerBoundCertStore::Flush(const base::Closure& completion_task) {
   if (backend_.get())
     backend_->Flush(completion_task);
   else if (!completion_task.is_null())
     MessageLoop::current()->PostTask(FROM_HERE, completion_task);
 }
 
 SQLiteServerBoundCertStore::~SQLiteServerBoundCertStore() {
   if (backend_.get()) {
     backend_->Close();
     // Release our reference, it will probably still have a reference if the
     // background thread has not run Close() yet.
     backend_ = NULL;
   }
 }