[IndexedDB] Closing mojo connections when renderer quits

content/browser/indexed_db/indexed_db_dispatcher_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
+#include "content/browser/indexed_db/database_impl.h"
 #include "content/common/indexed_db/indexed_db.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/associated_binding_set.h"
+#include "mojo/public/cpp/bindings/strong_associated_binding_set.h"

[Reilly Grant (use Gerrit), 2017/03/03 01:51:47]

This header is missing from the patch.

[dmurph, 2017/03/04 00:39:41]

Done.

 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/blob/blob_data_handle.h"
 
 namespace url {
 class Origin;
 }
 
 namespace content {
 class IndexedDBBlobInfo;
 class IndexedDBCallbacks;
 class IndexedDBContextImpl;
 class IndexedDBDatabaseCallbacks;
 
 // Handles all IndexedDB related messages from a particular renderer process.
 class IndexedDBDispatcherHost
     : public base::RefCountedThreadSafe<IndexedDBDispatcherHost,
                                         BrowserThread::DeleteOnIOThread>,
       public ::indexed_db::mojom::Factory {
  public:
   // Only call the constructor from the UI thread.
   IndexedDBDispatcherHost(int ipc_process_id,
                           net::URLRequestContextGetter* request_context_getter,
                           IndexedDBContextImpl* indexed_db_context,
                           ChromeBlobStorageContext* blob_storage_context);
 
   void AddBinding(::indexed_db::mojom::FactoryAssociatedRequest request);
 
+  void AddDatabaseBinding(
+      std::unique_ptr<::indexed_db::mojom::Database> database,
+      ::indexed_db::mojom::DatabaseAssociatedRequest request);
+
+  void AddCursorBinding(std::unique_ptr<::indexed_db::mojom::Cursor> cursor,
+                        ::indexed_db::mojom::CursorAssociatedRequest request);
+
+  void SetDatabaseImpl(std::unique_ptr<DatabaseImpl> database) {

[Reilly Grant (use Gerrit), 2017/03/03 01:59:59]

This function is unused and doesn't seem right to me because there could be
multiple database connections.

[dmurph, 2017/03/04 00:39:41]

Done.

+    database_impl_ = std::move(database);
+  }
+
   // A shortcut for accessing our context.
   IndexedDBContextImpl* context() const { return indexed_db_context_.get(); }
   storage::BlobStorageContext* blob_storage_context() const {
     return blob_storage_context_->context();
   }
   int ipc_process_id() const { return ipc_process_id_; }
 
   std::string HoldBlobData(const IndexedDBBlobInfo& blob_info);
   void DropBlobData(const std::string& uuid);
 
@@ skipping 30 matching lines @@
       const base::string16& name,
       int64_t version,
       int64_t transaction_id);
   void DeleteDatabaseOnIDBThread(scoped_refptr<IndexedDBCallbacks> callbacks,
                                  const url::Origin& origin,
                                  const base::string16& name,
                                  bool force_close);
 
   void ResetDispatcherHosts();
 
+  std::unique_ptr<DatabaseImpl> database_impl_;
+
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // Maps blob uuid to a pair (handle, ref count). Entry is added and/or count
   // is incremented in HoldBlobData(), and count is decremented and/or entry
   // removed in DropBlobData().
   std::map<std::string,
            std::pair<std::unique_ptr<storage::BlobDataHandle>, int>>
       blob_data_handle_map_;
 
   // Used to set file permissions for blob storage.
   const int ipc_process_id_;
 
   mojo::AssociatedBindingSet<::indexed_db::mojom::Factory> bindings_;
 
+  mojo::StrongAssociatedBindingSet<::indexed_db::mojom::Database>
+      database_bindings_;
+
+  mojo::StrongAssociatedBindingSet<::indexed_db::mojom::Cursor>
+      cursor_bindings_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_