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) {

[jochen (gone - plz use gerrit), 2010/12/02 15:09:51]

i'd push this even further down to the backend. in InternalBackgroundClose() you
can then delete the file

[pastarmovj, 2010/12/02 16:29:07]

The backend doesn't know the file name now and I don't see reason to copy it
there only for the sake of deleting it. I can anyhow ensure that nobody is still
using the file at the point I delete it. Moreover this class opens the file so
it is not precedent to do something with it here again.

 }
 
 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(
+                                &file_util::Delete, path_, false));
+  }
 }
 
 // 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);
-}