IndexedDB: More database<->transaction relationship simplification

content/browser/indexed_db/indexed_db_database.cc

Index: content/browser/indexed_db/indexed_db_database.cc
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
index 881c85985e2e84808300b02a1ce724cb3ad87084..7541aab90d992c4955b74b56dd6055b5c0c18816 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -139,8 +139,7 @@ IndexedDBDatabase::IndexedDBDatabase(const base::string16& name,
                 IndexedDBDatabaseMetadata::NO_INT_VERSION,
                 kInvalidId),
       identifier_(unique_identifier),
-      factory_(factory),
-      running_version_change_transaction_(NULL) {
+      factory_(factory) {
   DCHECK(!metadata_.name.empty());
 }
 
@@ -1259,14 +1258,6 @@ void IndexedDBDatabase::VersionChangeOperation(
       old_version, connection.Pass(), metadata(), data_loss, data_loss_message);
 }
 
-void IndexedDBDatabase::TransactionStarted(IndexedDBTransaction* transaction) {
-
-  if (transaction->mode() == indexed_db::TRANSACTION_VERSION_CHANGE) {
-    DCHECK(!running_version_change_transaction_);
-    running_version_change_transaction_ = transaction;
-  }
-}
-
 void IndexedDBDatabase::TransactionFinished(IndexedDBTransaction* transaction,
                                             bool committed) {
   DCHECK(transactions_.find(transaction->id()) != transactions_.end());
@@ -1274,9 +1265,6 @@ void IndexedDBDatabase::TransactionFinished(IndexedDBTransaction* transaction,
   transactions_.erase(transaction->id());
 
   if (transaction->mode() == indexed_db::TRANSACTION_VERSION_CHANGE) {
-    DCHECK_EQ(transaction, running_version_change_transaction_);
-    running_version_change_transaction_ = NULL;
-
     if (pending_second_half_open_) {
       if (committed) {
         DCHECK_EQ(pending_second_half_open_->Version(), metadata_.int_version);
@@ -1405,7 +1393,7 @@ void IndexedDBDatabase::TransactionCreated(IndexedDBTransaction* transaction) {
 
 bool IndexedDBDatabase::IsOpenConnectionBlocked() const {
   return !pending_delete_calls_.empty() ||
-         running_version_change_transaction_ ||
+         transaction_coordinator_.IsRunningVersionChangeTransaction() ||
          pending_run_version_change_transaction_call_;
 }