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

content/browser/indexed_db/indexed_db_database_callbacks.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 "content/browser/indexed_db/indexed_db_database_callbacks.h"
 
 #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;
 
 namespace content {
 
 class IndexedDBDatabaseCallbacks::IOThreadHelper {
  public:
   explicit IOThreadHelper(DatabaseCallbacksAssociatedPtrInfo callbacks_info);
   ~IOThreadHelper();
 
@@ skipping 40 matching lines @@
   if (!dispatcher_host_)
     return;
 
   DCHECK(io_helper_);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&IOThreadHelper::SendVersionChange,
                  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(
     ::indexed_db::mojom::ObserverChangesPtr changes) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(io_helper_);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&IOThreadHelper::SendChanges,
                  base::Unretained(io_helper_.get()), base::Passed(&changes)));
@@ skipping 26 matching lines @@
     int64_t transaction_id) {
   callbacks_->Complete(transaction_id);
 }
 
 void IndexedDBDatabaseCallbacks::IOThreadHelper::SendChanges(
     ::indexed_db::mojom::ObserverChangesPtr changes) {
   callbacks_->Changes(std::move(changes));
 }
 
 }  // namespace content