Revert of [IndexedDB] Delete callbacks state on worker thread exit.

content/child/indexed_db/indexed_db_dispatcher.h

 // Copyright 2013 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_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 109 matching lines @@
       IndexedDBCallbacksImpl::InternalState* callback_state);
   void RegisterMojoOwnedDatabaseCallbacks(
       blink::WebIDBDatabaseCallbacks* callback_state);
   void UnregisterMojoOwnedDatabaseCallbacks(
       blink::WebIDBDatabaseCallbacks* callback_state);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, CursorReset);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, CursorTransactionId);
 
-  // Looking up move-only entries in an std::unordered_set and removing them
-  // with out freeing them seems to be impossible so use a map instead so that
-  // the key type can remain a raw pointer.
-  using CallbackStateSet = std::unordered_map<
-      IndexedDBCallbacksImpl::InternalState*,
-      std::unique_ptr<IndexedDBCallbacksImpl::InternalState>>;
-  using DatabaseCallbackStateSet =
-      std::unordered_map<blink::WebIDBDatabaseCallbacks*,
-                         std::unique_ptr<blink::WebIDBDatabaseCallbacks>>;
-
   static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); }
 
   template <typename T>
   void init_params(T* params, blink::WebIDBCallbacks* callbacks_ptr) {
     std::unique_ptr<blink::WebIDBCallbacks> callbacks(callbacks_ptr);
     params->ipc_thread_id = CurrentWorkerId();
     params->ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
   }
 
   // IDBCallback message handlers.
@@ skipping 17 matching lines @@
   // Careful! WebIDBCallbacks wraps non-threadsafe data types. It must be
   // destroyed and used on the same thread it was created on.
   IDMap<blink::WebIDBCallbacks, IDMapOwnPointer> pending_callbacks_;
   IDMap<blink::WebIDBObserver, IDMapOwnPointer> observers_;
 
   // Holds pointers to the worker-thread owned state of IndexedDBCallbacksImpl
   // and IndexedDBDatabaseCallbacksImpl objects to makes sure that it is
   // destroyed on thread exit if the Mojo pipe is not yet closed. Otherwise the
   // object will leak because the thread's task runner is no longer executing
   // tasks.
-  CallbackStateSet mojo_owned_callback_state_;
-  DatabaseCallbackStateSet mojo_owned_database_callback_state_;
+  std::unordered_set<IndexedDBCallbacksImpl::InternalState*>
+      mojo_owned_callback_state_;
+  std::unordered_set<blink::WebIDBDatabaseCallbacks*>
+      mojo_owned_database_callback_state_;
 
   // Maps the ipc_callback_id from an open cursor request to the request's
   // transaction_id. Used to assign the transaction_id to the WebIDBCursorImpl
   // when it is created.
   std::map<int32_t, int64_t> cursor_transaction_ids_;
 
   // Map from cursor id to WebIDBCursorImpl.
   std::map<int32_t, WebIDBCursorImpl*> cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_