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

content/renderer/cache_storage/cache_storage_dispatcher.h

 // Copyright 2014 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_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_
 #define CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 148 matching lines @@
       std::unique_ptr<blink::WebServiceWorkerCache::CacheBatchCallbacks>
           callbacks,
       const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
           batch_operations);
 
   void OnWebCacheDestruction(int cache_id);
 
  private:
   class WebCache;
 
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks,
-                IDMapOwnPointer> CallbacksMap;
-  typedef IDMap<
-      blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks,
-      IDMapOwnPointer> WithCacheCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks,
-                IDMapOwnPointer> KeysCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks,
-                IDMapOwnPointer> StorageMatchCallbacksMap;
+  using CallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks>>;
+  using WithCacheCallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks>>;
+  using KeysCallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks>>;
+  using StorageMatchCallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks>>;
 
-  typedef base::hash_map<int32_t, base::TimeTicks> TimeMap;
+  using TimeMap = base::hash_map<int32_t, base::TimeTicks>;
 
-  typedef IDMap<blink::WebServiceWorkerCache::CacheMatchCallbacks,
-                IDMapOwnPointer> MatchCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCache::CacheWithResponsesCallbacks,
-                IDMapOwnPointer> WithResponsesCallbacksMap;
-  typedef IDMap<blink::WebServiceWorkerCache::CacheWithRequestsCallbacks,
-                IDMapOwnPointer> WithRequestsCallbacksMap;
+  using MatchCallbacksMap =
+      IDMap<std::unique_ptr<blink::WebServiceWorkerCache::CacheMatchCallbacks>>;
+  using WithResponsesCallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCache::CacheWithResponsesCallbacks>>;
+  using WithRequestsCallbacksMap = IDMap<std::unique_ptr<
+      blink::WebServiceWorkerCache::CacheWithRequestsCallbacks>>;
   using BatchCallbacksMap =
-      IDMap<blink::WebServiceWorkerCache::CacheBatchCallbacks, IDMapOwnPointer>;
+      IDMap<std::unique_ptr<blink::WebServiceWorkerCache::CacheBatchCallbacks>>;
 
   static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); }
 
   void PopulateWebResponseFromResponse(
       const ServiceWorkerResponse& response,
       blink::WebServiceWorkerResponse* web_response);
 
   blink::WebVector<blink::WebServiceWorkerResponse> WebResponsesFromResponses(
       const std::vector<ServiceWorkerResponse>& responses);
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   CallbacksMap has_callbacks_;
   WithCacheCallbacksMap open_callbacks_;
   CallbacksMap delete_callbacks_;
   KeysCallbacksMap keys_callbacks_;
   StorageMatchCallbacksMap match_callbacks_;
 
   TimeMap has_times_;
   TimeMap open_times_;
   TimeMap delete_times_;
   TimeMap keys_times_;
   TimeMap match_times_;
 
   // The individual caches created under this CacheStorage object.
-  IDMap<WebCache, IDMapExternalPointer> web_caches_;
+  IDMap<WebCache*> web_caches_;
 
   // These ID maps are held in the CacheStorage object rather than the Cache
   // object to ensure that the IDs are unique.
   MatchCallbacksMap cache_match_callbacks_;
   WithResponsesCallbacksMap cache_match_all_callbacks_;
   WithRequestsCallbacksMap cache_keys_callbacks_;
   BatchCallbacksMap cache_batch_callbacks_;
 
   TimeMap cache_match_times_;
   TimeMap cache_match_all_times_;
   TimeMap cache_keys_times_;
   TimeMap cache_batch_times_;
 
   base::WeakPtrFactory<CacheStorageDispatcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStorageDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_