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

content/child/service_worker/service_worker_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_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 157 matching lines @@
 
   // Unlike GetOrCreateThreadSpecificInstance() this doesn't create a new
   // instance if thread-local instance doesn't exist.
   static ServiceWorkerDispatcher* GetThreadSpecificInstance();
 
   base::SingleThreadTaskRunner* main_thread_task_runner() {
     return main_thread_task_runner_.get();
   }
 
  private:
-  typedef IDMap<WebServiceWorkerRegistrationCallbacks,
-      IDMapOwnPointer> RegistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerUpdateCallbacks, IDMapOwnPointer>
-      UpdateCallbackMap;
-  typedef IDMap<WebServiceWorkerUnregistrationCallbacks,
-      IDMapOwnPointer> UnregistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationCallbacks,
-      IDMapOwnPointer> GetRegistrationCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationsCallbacks,
-      IDMapOwnPointer> GetRegistrationsCallbackMap;
-  typedef IDMap<WebServiceWorkerGetRegistrationForReadyCallbacks,
-      IDMapOwnPointer> GetRegistrationForReadyCallbackMap;
+  using RegistrationCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerRegistrationCallbacks>>;
+  using UpdateCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerUpdateCallbacks>>;
+  using UnregistrationCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerUnregistrationCallbacks>>;
+  using GetRegistrationCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerGetRegistrationCallbacks>>;
+  using GetRegistrationsCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerGetRegistrationsCallbacks>>;
+  using GetRegistrationForReadyCallbackMap =
+      IDMap<std::unique_ptr<WebServiceWorkerGetRegistrationForReadyCallbacks>>;
   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;
-  typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
-  typedef std::map<int, ServiceWorkerProviderContext*> WorkerToProviderMap;
-  typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
-  typedef std::map<int, WebServiceWorkerRegistrationImpl*>
-      RegistrationObjectMap;
+  using ProviderClientMap =
+      std::map<int, blink::WebServiceWorkerProviderClient*>;
+  using ProviderContextMap = std::map<int, ServiceWorkerProviderContext*>;
+  using WorkerToProviderMap = std::map<int, ServiceWorkerProviderContext*>;
+  using WorkerObjectMap = std::map<int, WebServiceWorkerImpl*>;
+  using RegistrationObjectMap =
+      std::map<int, WebServiceWorkerRegistrationImpl*>;
 
   friend class ServiceWorkerDispatcherTest;
   friend class WebServiceWorkerImpl;
   friend class WebServiceWorkerRegistrationImpl;
 
   // WorkerThread::Observer implementation.
   void WillStopCurrentWorkerThread() override;
 
   void OnAssociateRegistration(int thread_id,
                                int provider_id,
@@ skipping 117 matching lines @@
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_