Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/cache_storage/cache_storage_dispatcher.h

Index: content/renderer/cache_storage/cache_storage_dispatcher.h
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.h b/content/renderer/cache_storage/cache_storage_dispatcher.h
index 6c810a09de4ad25ec826f1a2961bd380a5ccc118..53dc84fcc662d854e2b43c7b4f1fb0498f5d00e9 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.h
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.h
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/id_map.h"
@@ -105,23 +106,29 @@ class CacheStorageDispatcher : public WorkerThread::Observer {
   // TODO(jsbell): These are only called by WebServiceWorkerCacheStorageImpl
   // and should be renamed to match Chromium conventions. crbug.com/439389
   void dispatchHas(
-      blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
+      std::unique_ptr<
+          blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks> callbacks,
       const url::Origin& origin,
       const blink::WebString& cacheName);
   void dispatchOpen(
-      blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks*
+      std::unique_ptr<
+          blink::WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks>
           callbacks,
       const url::Origin& origin,
       const blink::WebString& cacheName);
   void dispatchDelete(
-      blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
+      std::unique_ptr<
+          blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks> callbacks,
       const url::Origin& origin,
       const blink::WebString& cacheName);
   void dispatchKeys(
-      blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks* callbacks,
+      std::unique_ptr<
+          blink::WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks>
+          callbacks,
       const url::Origin& origin);
   void dispatchMatch(
-      blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks*
+      std::unique_ptr<
+          blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks>
           callbacks,
       const url::Origin& origin,
       const blink::WebServiceWorkerRequest& request,
@@ -131,22 +138,26 @@ class CacheStorageDispatcher : public WorkerThread::Observer {
   // process.
   void dispatchMatchForCache(
       int cache_id,
-      blink::WebServiceWorkerCache::CacheMatchCallbacks* callbacks,
+      std::unique_ptr<blink::WebServiceWorkerCache::CacheMatchCallbacks>
+          callbacks,
       const blink::WebServiceWorkerRequest& request,
       const blink::WebServiceWorkerCache::QueryParams& query_params);
   void dispatchMatchAllForCache(
       int cache_id,
-      blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks,
+      std::unique_ptr<blink::WebServiceWorkerCache::CacheWithResponsesCallbacks>
+          callbacks,
       const blink::WebServiceWorkerRequest& request,
       const blink::WebServiceWorkerCache::QueryParams& query_params);
   void dispatchKeysForCache(
       int cache_id,
-      blink::WebServiceWorkerCache::CacheWithRequestsCallbacks* callbacks,
+      std::unique_ptr<blink::WebServiceWorkerCache::CacheWithRequestsCallbacks>
+          callbacks,
       const blink::WebServiceWorkerRequest& request,
       const blink::WebServiceWorkerCache::QueryParams& query_params);
   void dispatchBatchForCache(
       int cache_id,
-      blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks,
+      std::unique_ptr<blink::WebServiceWorkerCache::CacheBatchCallbacks>
+          callbacks,
       const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
           batch_operations);