Refactored cookies persistent store clean-up on shutdown.

chrome/browser/net/sqlite_persistent_cookie_store.cc

 // Copyright (c) 2010 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_persistent_cookie_store.h"
 
 #include <list>
 
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
@@ skipping 233 matching lines @@
 void SQLitePersistentCookieStore::Backend::InternalBackgroundClose() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   // Commit any pending operations
   Commit();
 
   delete db_;
   db_ = NULL;
 }
 
 SQLitePersistentCookieStore::SQLitePersistentCookieStore(const FilePath& path)
-    : path_(path) {
+    : path_(path),
+      clear_local_state_on_exit_(false) {
 }
 
 SQLitePersistentCookieStore::~SQLitePersistentCookieStore() {
   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;
   }
+  if (clear_local_state_on_exit_) {
+    // To avoid concurrent run with possibly not finished file close op on the
+    // DB thread we delete the file on the same thread as well.
+    BrowserThread::PostTask(
+        BrowserThread::DB,
+        FROM_HERE,
+        NewRunnableFunction<bool(*)(const FilePath&, bool), FilePath, bool>(
+            &file_util::Delete, path_, false));

[Randy Smith (Not in Mondays), 2010/12/02 21:19:26]

I'm willing to accept this interface, but I think a better one would be simply
to communicate the clear_local_state_on_exit_ to the backend whenever it's
set/cleared, and let the backend InternalClose function do the right thing. 
It's already on the right thread, so you don't need to do any thread hopping.

[pastarmovj, 2010/12/03 16:43:02]

Obsoleted because of the moved logic to Backend.

+  }
 }
 
 // Version number of the database. In version 4, we migrated the time epoch.
 // If you open the DB with an older version on Mac or Linux, the times will
 // look wonky, but the file will likely be usable. On Windows version 3 and 4
 // are the same.
 //
 // Version 3 updated the database to include the last access time, so we can
 // expire them in decreasing order of use when we've reached the maximum
 // number of cookies.
@@ skipping 158 matching lines @@
     const net::CookieMonster::CanonicalCookie& cc) {
   if (backend_.get())
     backend_->UpdateCookieAccessTime(cc);
 }
 
 void SQLitePersistentCookieStore::DeleteCookie(
     const net::CookieMonster::CanonicalCookie& cc) {
   if (backend_.get())
     backend_->DeleteCookie(cc);
 }
-
-// static
-void SQLitePersistentCookieStore::ClearLocalState(
-    const FilePath& path) {
-  file_util::Delete(path, false);
-}