Close ArchivedDatabase connection after transaction rollback.

chrome/browser/history/archived_database.cc

Index: chrome/browser/history/archived_database.cc
diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc
index d932a57b0c26b8986952faaf298a855015e3b377..c15ff826a1d76504d4957ba7cd304f2343514331 100644
--- a/chrome/browser/history/archived_database.cc
+++ b/chrome/browser/history/archived_database.cc
@@ -42,32 +42,34 @@ bool ArchivedDatabase::Init(const FilePath& file_name) {
   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();
 }