[IndexedDB] Closing mojo connections when renderer quits

content/browser/indexed_db/database_impl.cc

Index: content/browser/indexed_db/database_impl.cc
diff --git a/content/browser/indexed_db/database_impl.cc b/content/browser/indexed_db/database_impl.cc
index 922feabba842b04e0821e401a99b482e556f8bad..28a3829332a40b82ba5c62fe5a86c120011a6be6 100644
--- a/content/browser/indexed_db/database_impl.cc
+++ b/content/browser/indexed_db/database_impl.cc
@@ -132,10 +132,9 @@ class DatabaseImpl::IDBThreadHelper {
   base::WeakPtrFactory<IDBThreadHelper> weak_factory_;
 };
 
-DatabaseImpl::DatabaseImpl(
-    std::unique_ptr<IndexedDBConnection> connection,
-    const url::Origin& origin,
-    scoped_refptr<IndexedDBDispatcherHost> dispatcher_host)
+DatabaseImpl::DatabaseImpl(std::unique_ptr<IndexedDBConnection> connection,
+                           const url::Origin& origin,
+                           IndexedDBDispatcherHost* dispatcher_host)
     : dispatcher_host_(dispatcher_host),
       origin_(origin),
       idb_runner_(base::ThreadTaskRunnerHandle::Get()) {
@@ -223,7 +222,7 @@ void DatabaseImpl::Get(
     bool key_only,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE, base::Bind(&IDBThreadHelper::Get, base::Unretained(helper_),
                             transaction_id, object_store_id, index_id,
@@ -239,7 +238,7 @@ void DatabaseImpl::GetAll(
     int64_t max_count,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::GetAll, base::Unretained(helper_),
@@ -292,7 +291,7 @@ void DatabaseImpl::Put(
   }
 
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
 
   idb_runner_->PostTask(
       FROM_HERE,
@@ -332,7 +331,7 @@ void DatabaseImpl::OpenCursor(
     blink::WebIDBTaskType task_type,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::OpenCursor, base::Unretained(helper_),
@@ -347,7 +346,7 @@ void DatabaseImpl::Count(
     const IndexedDBKeyRange& key_range,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE, base::Bind(&IDBThreadHelper::Count, base::Unretained(helper_),
                             transaction_id, object_store_id, index_id,
@@ -360,7 +359,7 @@ void DatabaseImpl::DeleteRange(
     const IndexedDBKeyRange& key_range,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::DeleteRange, base::Unretained(helper_),
@@ -373,7 +372,7 @@ void DatabaseImpl::Clear(
     int64_t object_store_id,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
   scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+      dispatcher_host_, origin_, std::move(callbacks_info)));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::Clear, base::Unretained(helper_),