Close ArchivedDatabase connection after transaction rollback.

chrome/browser/history/archived_database.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 <algorithm>
 #include <string>
 
 #include "base/string_util.h"
 #include "chrome/browser/history/archived_database.h"
 #include "sql/transaction.h"
@@ skipping 24 matching lines @@
   // anything important.
   db_.set_cache_size(64);
 
   // Run the database in exclusive mode. Nobody else should be accessing the
   // database while we're running, and this will give somewhat improved perf.
   db_.set_exclusive_locking();
 
   if (!db_.Open(file_name))
     return false;
 
-  sql::Transaction transaction(&db_);
-  if (!transaction.Begin()) {
+  if (!DoInitTransaction()) {
     db_.Close();
     return false;
   }
 
+  return true;
+}
+
+bool ArchivedDatabase::DoInitTransaction() {

[brettw, 2012/06/27 17:12:22]

This name confused me because I read it as initializing a transaction rather
than initializing in a transaction. Maybe InitTables()?

+  sql::Transaction transaction(&db_);
+  if (!transaction.Begin())
+    return false;
+
   // Version check.
   if (!meta_table_.Init(&db_, kCurrentVersionNumber,
-                        kCompatibleVersionNumber)) {
-    db_.Close();
+                        kCompatibleVersionNumber))
     return false;
-  }
 
   // Create the tables.
   if (!CreateURLTable(false) || !InitVisitTable() ||
-      !InitKeywordSearchTermsTable()) {
-    db_.Close();
+      !InitKeywordSearchTermsTable())
     return false;
-  }
+
   CreateMainURLIndex();
   CreateKeywordSearchTermsIndices();
 
-  if (EnsureCurrentVersion() != sql::INIT_OK) {
-    db_.Close();
+  if (EnsureCurrentVersion() != sql::INIT_OK)
     return false;
-  }
 
   return transaction.Commit();
 }
 
 void ArchivedDatabase::BeginTransaction() {
   db_.BeginTransaction();
 }
 
 void ArchivedDatabase::CommitTransaction() {
   db_.CommitTransaction();
@@ skipping 55 matching lines @@
   // Put future migration cases here.
 
   // When the version is too old, we just try to continue anyway, there should
   // not be a released product that makes a database too old for us to handle.
   LOG_IF(WARNING, cur_version < kCurrentVersionNumber) <<
       "Archived database version " << cur_version << " is too old to handle.";
 
   return sql::INIT_OK;
 }
 }  // namespace history