Close ArchivedDatabase connection after transaction rollback.

chrome/browser/history/archived_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "chrome/browser/history/url_database.h"
@@ skipping 25 matching lines @@
   // Transactions on the database. We support nested transactions and only
   // commit when the outermost one is committed (sqlite doesn't support true
   // nested transactions).
   void BeginTransaction();
   void CommitTransaction();
 
   // Returns the current version that we will generate archived databases with.
   static int GetCurrentVersion();
 
  private:
+  bool DoInitTransaction();
+
   // Implemented for the specialized databases.
   virtual sql::Connection& GetDB() OVERRIDE;
 
   // Makes sure the version is up-to-date, updating if necessary. If the
   // database is too old to migrate, the user will be notified. In this case, or
   // for other errors, false will be returned. True means it is up-to-date and
   // ready for use.
   //
   // This assumes it is called from the init function inside a transaction. It
   // may commit the transaction and start a new one if migration requires it.
   sql::InitStatus EnsureCurrentVersion();
 
   // The database.
   sql::Connection db_;
   sql::MetaTable meta_table_;
 
   DISALLOW_COPY_AND_ASSIGN(ArchivedDatabase);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_