[IndexedDB] Refactoring to remove ref ptrs and host transaction ids.

content/browser/indexed_db/indexed_db_database_callbacks.cc

Index: content/browser/indexed_db/indexed_db_database_callbacks.cc
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.cc b/content/browser/indexed_db/indexed_db_database_callbacks.cc
index 90daa5ff7e092259902e1bfe2243d4231acef8aa..42ce8b4a0f2bf2c7881e36fb8e98f0ac0c7ce8de 100644
--- a/content/browser/indexed_db/indexed_db_database_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_database_callbacks.cc
@@ -7,6 +7,7 @@
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
+#include "content/browser/indexed_db/indexed_db_transaction.h"
 
 using ::indexed_db::mojom::DatabaseCallbacksAssociatedPtrInfo;
 
@@ -67,33 +68,33 @@ void IndexedDBDatabaseCallbacks::OnVersionChange(int64_t old_version,
                  base::Unretained(io_helper_.get()), old_version, new_version));
 }
 
-void IndexedDBDatabaseCallbacks::OnAbort(int64_t host_transaction_id,
-                                         const IndexedDBDatabaseError& error) {
+void IndexedDBDatabaseCallbacks::OnAbort(
+    const IndexedDBTransaction& transaction,
+    const IndexedDBDatabaseError& error) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!dispatcher_host_)
     return;
 
-  dispatcher_host_->FinishTransaction(host_transaction_id, false);
   DCHECK(io_helper_);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&IOThreadHelper::SendAbort, base::Unretained(io_helper_.get()),
-                 dispatcher_host_->RendererTransactionId(host_transaction_id),
-                 error));
+                 transaction.id(), error));
 }
 
-void IndexedDBDatabaseCallbacks::OnComplete(int64_t host_transaction_id) {
+void IndexedDBDatabaseCallbacks::OnComplete(
+    const IndexedDBTransaction& transaction) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!dispatcher_host_)
     return;
 
-  dispatcher_host_->FinishTransaction(host_transaction_id, true);
+  dispatcher_host_->NotifyTransactionCommitted(

[jsbell, 2016/11/30 21:30:14]

How about just calling dispatcher_host_->context()->TransactionComplete()
directly?

[dmurph, 2016/11/30 23:13:07]

Done.

+      transaction.database()->origin());
   DCHECK(io_helper_);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&IOThreadHelper::SendComplete,
-                 base::Unretained(io_helper_.get()),
-                 dispatcher_host_->RendererTransactionId(host_transaction_id)));
+                 base::Unretained(io_helper_.get()), transaction.id()));
 }
 
 void IndexedDBDatabaseCallbacks::OnDatabaseChange(