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

content/browser/indexed_db/indexed_db_connection.h

Index: content/browser/indexed_db/indexed_db_connection.h
diff --git a/content/browser/indexed_db/indexed_db_connection.h b/content/browser/indexed_db/indexed_db_connection.h
index ce60ebd8cc5f6cf33d5f811011e0a24d4cc40abc..820995f43740829ba84ab44fc7577fc4354450ba 100644
--- a/content/browser/indexed_db/indexed_db_connection.h
+++ b/content/browser/indexed_db/indexed_db_connection.h
@@ -6,20 +6,28 @@
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CONNECTION_H_
 
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
-#include "content/browser/indexed_db/indexed_db_database_callbacks.h"
-#include "content/browser/indexed_db/indexed_db_observer.h"
+#include "url/origin.h"

[cmumford, 2016/12/01 19:14:51]

origin.h is unused, but you can include <set>.

[dmurph, 2016/12/01 21:12:23]

Done.

 
 namespace content {
+class IndexedDBDatabaseCallbacks;
+class IndexedDBDatabaseError;
+class IndexedDBObserver;
+class IndexedDBTransaction;
 
 class CONTENT_EXPORT IndexedDBConnection {
  public:
-  IndexedDBConnection(scoped_refptr<IndexedDBDatabase> db,
+  using TransactionMap =
+      std::unordered_map<int64_t, std::unique_ptr<IndexedDBTransaction>>;
+
+  IndexedDBConnection(int child_process_id,
+                      scoped_refptr<IndexedDBDatabase> db,
                       scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
   virtual ~IndexedDBConnection();
 
@@ -38,6 +46,7 @@ class CONTENT_EXPORT IndexedDBConnection {
   virtual void RemoveObservers(const std::vector<int32_t>& remove_observer_ids);
 
   int32_t id() const { return id_; }
+  int child_process_id() const { return child_process_id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
   IndexedDBDatabaseCallbacks* callbacks() const { return callbacks_.get(); }
@@ -49,12 +58,43 @@ class CONTENT_EXPORT IndexedDBConnection {
     return weak_factory_.GetWeakPtr();
   }
 
+  // Creates a transaction for this connection.
+  IndexedDBTransaction* CreateTransaction(
+      int64_t id,
+      const std::set<int64_t>& scope,
+      blink::WebIDBTransactionMode mode,
+      IndexedDBBackingStore::Transaction* backing_store_transaction);
+
+  void AbortTransaction(IndexedDBTransaction* transaction);
+  void AbortTransaction(IndexedDBTransaction* transaction,
+                        const IndexedDBDatabaseError& error);
+
+  void AbortAllTransactions(const IndexedDBDatabaseError& error);
+
+  IndexedDBTransaction* GetTransaction(int64_t id);

[cmumford, 2016/12/01 19:14:51]

Function should be const.

[dmurph, 2016/12/01 21:12:23]

Done.

+
+  base::WeakPtr<IndexedDBTransaction> AddTransactionForTesting(
+      std::unique_ptr<IndexedDBTransaction> transaction);
+
+  // We ignore calls where the id doesn't exist to facilitate the AbortAll call.
+  // TODO(dmurph): Change that so this doesn't need to ignore unknown ids.
+  void RemoveTransaction(int64_t id);
+
+  const TransactionMap& transactions() const { return transactions_; }

[cmumford, 2016/12/01 19:14:51]

transactions() is unused.

Also, now that there is only place where TransactionMap is used (transactions_)
consider deleting that typedef. Your call - I'm an acknowledged typedef bigot
;-)

[dmurph, 2016/12/01 21:12:23]

haha ok done ;)

+
  private:
   const int32_t id_;
 
+  // The process id of the child process this connection is associated with.
+  // Tracked for IndexedDBContextImpl::GetAllOriginsDetails and debugging.
+  const int child_process_id_;
+
   // NULL in some unit tests, and after the connection is closed.
   scoped_refptr<IndexedDBDatabase> database_;
 
+  // The connection owns transactions created on this connection.
+  TransactionMap transactions_;
+
   // The callbacks_ member is cleared when the connection is closed.
   // May be NULL in unit tests.
   scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;