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

content/browser/indexed_db/indexed_db_dispatcher_host.h

Index: content/browser/indexed_db/indexed_db_dispatcher_host.h
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.h b/content/browser/indexed_db/indexed_db_dispatcher_host.h
index 5934c6f7dfc84b23617f37b0f2f0cd23f21e6f01..32f5a44377faa7e7e7a52e7dc309a61fdeeead9f 100644
--- a/content/browser/indexed_db/indexed_db_dispatcher_host.h
+++ b/content/browser/indexed_db/indexed_db_dispatcher_host.h
@@ -87,7 +87,7 @@ class IndexedDBDispatcherHost
       const IPC::Message& message) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  void FinishTransaction(int64_t host_transaction_id, bool committed);
+  void FinishTransaction(url::Origin transaction_origin, bool committed);

[cmumford, 2016/11/04 23:33:12]

It looks like the Transaction from which this origin came is still OK. Can you
use:

  const url::Origin&

[dmurph, 2016/11/07 20:05:23]

Done.

 
   // A shortcut for accessing our context.
   IndexedDBContextImpl* context() const { return indexed_db_context_.get(); }
@@ -97,26 +97,12 @@ class IndexedDBDispatcherHost
 
   // IndexedDBCallbacks call these methods to add the results into the
   // applicable map.  See below for more details.
-  int32_t Add(IndexedDBCursor* cursor);
+  int32_t Add(std::unique_ptr<IndexedDBCursor> cursor);
   int32_t Add(IndexedDBConnection* connection,
               const url::Origin& origin);
 
-  void RegisterTransactionId(int64_t host_transaction_id,
-                             const url::Origin& origin);
-
   IndexedDBCursor* GetCursorFromId(int32_t ipc_cursor_id);
 
-  // These are called to map a 32-bit front-end (renderer-specific) transaction
-  // id to and from a back-end ("host") transaction id that encodes the process
-  // id in the high 32 bits. The mapping is host-specific and ids are validated.
-  int64_t HostTransactionId(int64_t transaction_id);
-  int64_t RendererTransactionId(int64_t host_transaction_id);
-
-  // These are called to decode a host transaction ID, for diagnostic purposes.
-  static uint32_t TransactionIdToRendererTransactionId(
-      int64_t host_transaction_id);
-  static uint32_t TransactionIdToProcessId(int64_t host_transaction_id);
-
   std::string HoldBlobData(const IndexedDBBlobInfo& blob_info);
 
   // True if the channel is closing/closed and outstanding requests
@@ -129,9 +115,6 @@ class IndexedDBDispatcherHost
   friend class base::DeleteHelper<IndexedDBDispatcherHost>;
 
   // Used in nested classes.
-  typedef std::map<int64_t, int64_t> TransactionIDToDatabaseIDMap;
-  typedef std::map<int64_t, uint64_t> TransactionIDToSizeMap;
-  typedef std::map<int64_t, url::Origin> TransactionIDToOriginMap;
   typedef std::map<int32_t, url::Origin> WebIDBObjectIDToOriginMap;
 
   // IDMap for RefCounted types
@@ -238,9 +221,6 @@ class IndexedDBDispatcherHost
     IndexedDBDispatcherHost* parent_;
     IDMap<IndexedDBConnection, IDMapOwnPointer> map_;
     WebIDBObjectIDToOriginMap database_origin_map_;
-    TransactionIDToSizeMap transaction_size_map_;
-    TransactionIDToOriginMap transaction_origin_map_;
-    TransactionIDToDatabaseIDMap transaction_database_map_;
 
     // Weak pointers are used when an asynchronous quota request is made, in
     // case the dispatcher is torn down before the response returns.
@@ -276,7 +256,7 @@ class IndexedDBDispatcherHost
     void OnDestroyed(int32_t ipc_cursor_id);
 
     IndexedDBDispatcherHost* parent_;
-    RefIDMap<IndexedDBCursor> map_;
+    IDMap<IndexedDBCursor, IDMapOwnPointer> map_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(CursorDispatcherHost);