Part 2 of base::IDMap refactor to eliminate IDMapOwnPointer/IDMapExternalPointer modes

content/child/service_worker/service_worker_dispatcher.h

Index: content/child/service_worker/service_worker_dispatcher.h
diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h
index 61a6c733c734039fe7ed65ba74fe5881992c9a25..3c8e1b1320f74ad77e7ee06a269c52d838a9e095 100644
--- a/content/child/service_worker/service_worker_dispatcher.h
+++ b/content/child/service_worker/service_worker_dispatcher.h
@@ -175,24 +175,25 @@ class CONTENT_EXPORT ServiceWorkerDispatcher : public WorkerThread::Observer {
   }
 
  private:
-  typedef IDMap<WebServiceWorkerRegistrationCallbacks,
-      IDMapOwnPointer> RegistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerUpdateCallbacks, IDMapOwnPointer>
+  typedef IDMap<std::unique_ptr<WebServiceWorkerRegistrationCallbacks>>
+      RegistrationCallbackMap;
+  typedef IDMap<std::unique_ptr<WebServiceWorkerUpdateCallbacks>>
       UpdateCallbackMap;
-  typedef IDMap<WebServiceWorkerUnregistrationCallbacks,
-      IDMapOwnPointer> UnregistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationCallbacks,
-      IDMapOwnPointer> GetRegistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationsCallbacks,
-      IDMapOwnPointer> GetRegistrationsCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationForReadyCallbacks,
-      IDMapOwnPointer> GetRegistrationForReadyCallbackMap;
+  typedef IDMap<std::unique_ptr<WebServiceWorkerUnregistrationCallbacks>>
+      UnregistrationCallbackMap;
+  typedef IDMap<std::unique_ptr<WebServiceWorkerGetRegistrationCallbacks>>
+      GetRegistrationCallbackMap;
+  typedef IDMap<std::unique_ptr<WebServiceWorkerGetRegistrationsCallbacks>>
+      GetRegistrationsCallbackMap;
+  typedef IDMap<
+      std::unique_ptr<WebServiceWorkerGetRegistrationForReadyCallbacks>>
+      GetRegistrationForReadyCallbackMap;
   using EnableNavigationPreloadCallbackMap =
-      IDMap<WebEnableNavigationPreloadCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<WebEnableNavigationPreloadCallbacks>>;
   using GetNavigationPreloadStateCallbackMap =
-      IDMap<WebGetNavigationPreloadStateCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<WebGetNavigationPreloadStateCallbacks>>;
   using SetNavigationPreloadHeaderCallbackMap =
-      IDMap<WebSetNavigationPreloadHeaderCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<WebSetNavigationPreloadHeaderCallbacks>>;
 
   typedef std::map<int, blink::WebServiceWorkerProviderClient*>
       ProviderClientMap;