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

content/renderer/service_worker/service_worker_context_client.cc

Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 513620537b570e30b67e616892fc6da6eb2746a3..71ce60cadd8d0c9fef5d35c87539d69776c9e13c 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -171,18 +171,17 @@ ToWebServiceWorkerClientInfo(const ServiceWorkerClientInfo& client_info) {
 // worker thread.
 struct ServiceWorkerContextClient::WorkerContextData {
   using ClientsCallbacksMap =
-      IDMap<blink::WebServiceWorkerClientsCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<blink::WebServiceWorkerClientsCallbacks>>;
   using ClaimClientsCallbacksMap =
-      IDMap<blink::WebServiceWorkerClientsClaimCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<blink::WebServiceWorkerClientsClaimCallbacks>>;
   using ClientCallbacksMap =
-      IDMap<blink::WebServiceWorkerClientCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<blink::WebServiceWorkerClientCallbacks>>;
   using SkipWaitingCallbacksMap =
-      IDMap<blink::WebServiceWorkerSkipWaitingCallbacks, IDMapOwnPointer>;
-  using SyncEventCallbacksMap = IDMap<const SyncCallback, IDMapOwnPointer>;
-  using FetchEventCallbacksMap = IDMap<const FetchCallback, IDMapOwnPointer>;
-  using NavigationPreloadRequestsMap =
-      IDMap<ServiceWorkerContextClient::NavigationPreloadRequest,
-            IDMapOwnPointer>;
+      IDMap<std::unique_ptr<blink::WebServiceWorkerSkipWaitingCallbacks>>;
+  using SyncEventCallbacksMap = IDMap<std::unique_ptr<const SyncCallback>>;
+  using FetchEventCallbacksMap = IDMap<std::unique_ptr<const FetchCallback>>;
+  using NavigationPreloadRequestsMap = IDMap<
+      std::unique_ptr<ServiceWorkerContextClient::NavigationPreloadRequest>>;
 
   explicit WorkerContextData(ServiceWorkerContextClient* owner)
       : event_dispatcher_binding(owner),