Implement sql::Connection::RazeAndClose().

chrome/browser/net/sqlite_persistent_cookie_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_persistent_cookie_store.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 529 matching lines @@
   if (file_util::GetFileSize(path_, &db_size))
     UMA_HISTOGRAM_COUNTS("Cookie.DBSizeInKB", db_size / 1024 );
 
   db_.reset(new sql::Connection);
   db_->set_error_histogram_name("Sqlite.Cookie.Error");
   db_->set_error_delegate(new KillDatabaseErrorDelegate(this));
 
   if (!db_->Open(path_)) {
     NOTREACHED() << "Unable to open cookie DB.";
     if (corruption_detected_)
       db_->Raze();

[pkotwicz, 2013/01/31 19:22:00]

Comment: In a future CL, it would be nice to be able to make this logic simpler.

[Scott Hess - ex-Googler, 2013/02/05 01:20:25]

I think the long-term goal for this code (and others like it) should be that in
case of corruption, the database is reset and we start fresh, but we do not fail
(unless it happens three times in a row or something).  I have a prototype which
lets you ask Open() to automatically Raze() if corruption is detected there,
right now there are cases where Open() fails too early for anyone to handle the
error (I'd have to find my notes to elaborate on that).

Hitting the versioning case is tougher to automate, because sql::Connection
doesn't know what the higher-level code is doing.  But we can probably work
something out.

     meta_table_.Reset();
     db_.reset();
     return false;
   }
 
   if (!EnsureDatabaseVersion() || !InitTable(db_.get())) {
     NOTREACHED() << "Unable to open cookie DB.";
     if (corruption_detected_)
       db_->Raze();
     meta_table_.Reset();
@@ skipping 476 matching lines @@
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&Backend::KillDatabase, this));
 }
 
 void SQLitePersistentCookieStore::Backend::KillDatabase() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (db_.get()) {
     // This Backend will now be in-memory only. In a future run we will recreate
     // the database. Hopefully things go better then!
-    bool success = db_->Raze();
+    bool success = db_->RazeAndClose();
     UMA_HISTOGRAM_BOOLEAN("Cookie.KillDatabaseResult", success);
-    db_->Close();
     meta_table_.Reset();
     db_.reset();
   }
 }
 
 void SQLitePersistentCookieStore::Backend::SetForceKeepSessionState() {
   base::AutoLock locked(lock_);
   force_keep_session_state_ = true;
 }
 
@@ skipping 40 matching lines @@
 
 void SQLitePersistentCookieStore::Flush(const base::Closure& callback) {
   backend_->Flush(callback);
 }
 
 SQLitePersistentCookieStore::~SQLitePersistentCookieStore() {
   backend_->Close();
   // We release our reference to the Backend, though it will probably still have
   // a reference if the background thread has not run Close() yet.
 }