[IndexedDB] Closing mojo connections when renderer quits

content/browser/indexed_db/database_impl.h

 // Copyright 2016 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 CONTENT_BROWSER_INDEXED_DB_DATABASE_IMPL_H_
 #define CONTENT_BROWSER_INDEXED_DB_DATABASE_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/indexed_db/indexed_db.mojom.h"
 
+namespace base {
+class SequencedTaskRunner;
+}
+
 namespace content {
 
 class IndexedDBConnection;
 class IndexedDBDispatcherHost;
 
+// Expected to be constructed, called, and destructed on the IO thread.
 class DatabaseImpl : public ::indexed_db::mojom::Database {
  public:
   explicit DatabaseImpl(std::unique_ptr<IndexedDBConnection> connection,
                         const url::Origin& origin,
-                        scoped_refptr<IndexedDBDispatcherHost> dispatcher_host);
+                        IndexedDBDispatcherHost* dispatcher_host,
+                        scoped_refptr<base::SequencedTaskRunner> idb_runner);
   ~DatabaseImpl() override;
 
   // ::indexed_db::mojom::Database implementation
   void CreateObjectStore(int64_t transaction_id,
                          int64_t object_store_id,
                          const base::string16& name,
                          const IndexedDBKeyPath& key_path,
                          bool auto_increment) override;
   void DeleteObjectStore(int64_t transaction_id,
                          int64_t object_store_id) override;
@@ skipping 21 matching lines @@
   void GetAll(
       int64_t transaction_id,
       int64_t object_store_id,
       int64_t index_id,
       const IndexedDBKeyRange& key_range,
       bool key_only,
       int64_t max_count,
       ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks) override;
   void Put(int64_t transaction_id,
            int64_t object_store_id,
-           indexed_db::mojom::ValuePtr value,
+           ::indexed_db::mojom::ValuePtr value,
            const IndexedDBKey& key,
            blink::WebIDBPutMode mode,
            const std::vector<IndexedDBIndexKeys>& index_keys,
            ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks) override;
   void SetIndexKeys(int64_t transaction_id,
                     int64_t object_store_id,
                     const IndexedDBKey& primary_key,
                     const std::vector<IndexedDBIndexKeys>& index_keys) override;
   void SetIndexesReady(int64_t transaction_id,
                        int64_t object_store_id,
@@ skipping 37 matching lines @@
                    int64_t index_id,
                    const base::string16& new_name) override;
   void Abort(int64_t transaction_id) override;
   void Commit(int64_t transaction_id) override;
   void AckReceivedBlobs(const std::vector<std::string>& uuids) override;
 
  private:
   class IDBThreadHelper;
 
   IDBThreadHelper* helper_;
-  scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
+  // This raw pointer is safe because all DatabaseImpl instances are owned by
+  // an IndexedDBDispatcherHost.
+  IndexedDBDispatcherHost* dispatcher_host_;
   const url::Origin origin_;
-  scoped_refptr<base::SingleThreadTaskRunner> idb_runner_;
+  scoped_refptr<base::SequencedTaskRunner> idb_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(DatabaseImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_DATABASE_IMPL_H_