Refactored cookies persistent store clean-up on shutdown.

chrome/browser/net/sqlite_persistent_cookie_store.cc

Index: chrome/browser/net/sqlite_persistent_cookie_store.cc
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc
index 88b7bb9bc8026b7d4fa938ca72fe20b5c694789d..cbdb36fc2f42d0adefa21968212e787bc87ca14c 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc
@@ -31,7 +31,8 @@ class SQLitePersistentCookieStore::Backend
   explicit Backend(const FilePath& path)
       : path_(path),
         db_(NULL),
-        num_pending_(0) {
+        num_pending_(0),
+        clear_local_state_on_exit_(false) {
   }
 
   // Creates or load the SQLite database.
@@ -50,6 +51,10 @@ class SQLitePersistentCookieStore::Backend
   // before the object is destructed.
   void Close();
 
+  void SetClearLocalStateOnExit(bool clear_local_state) {
+    clear_local_state_on_exit_ = clear_local_state;
+  }
+
  private:
   friend class base::RefCountedThreadSafe<SQLitePersistentCookieStore::Backend>;
 
@@ -99,6 +104,8 @@ class SQLitePersistentCookieStore::Backend
   PendingOperationsList pending_;
   PendingOperationsList::size_type num_pending_;
   Lock pending_lock_;  // Guard pending_ and num_pending_
+  // True if the persistent store should be deleted upon destruction.
+  bool clear_local_state_on_exit_;
 
   DISALLOW_COPY_AND_ASSIGN(Backend);
 };
@@ -420,6 +427,9 @@ void SQLitePersistentCookieStore::Backend::InternalBackgroundClose() {
   Commit();
 
   db_.reset();
+
+  if (clear_local_state_on_exit_)
+    file_util::Delete(path_, false);
 }
 
 SQLitePersistentCookieStore::SQLitePersistentCookieStore(const FilePath& path)
@@ -458,8 +468,8 @@ void SQLitePersistentCookieStore::DeleteCookie(
     backend_->DeleteCookie(cc);
 }
 
-// static
-void SQLitePersistentCookieStore::ClearLocalState(
-    const FilePath& path) {
-  file_util::Delete(path, false);
+void SQLitePersistentCookieStore::SetClearLocalStateOnExit(
+    bool clear_local_state) {
+  if (backend_.get())
+    backend_->SetClearLocalStateOnExit(clear_local_state);

[Randy Smith (Not in Mondays), 2010/12/03 18:42:27]

Could you protect this with the lock (and modify the comment on the lock to
indicate it protects this field as well)?  It shouldn't matter--boolean accesses
should be atomic so you don't really care who wins the possible races, and I
can't come up with a case in which the race would actually happen--but I'd
rather be extra careful around thread safety in chrome since most code is
single-threaded and hence most developers aren't used to thinking about thread
safety in detail.

[pastarmovj, 2010/12/06 08:57:40]

Done. I had exactly the same thoughts and didn't put the lock there because all
calls to this function are routed through the same thread. However maybe it's
more failsafe this way anyhow and I don't see potential for deadlocks here
either.

 }