Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

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>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "content/public/child/worker_thread.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h"
@@ skipping 78 matching lines @@
   void OnCacheKeysError(int thread_id,
                         int request_id,
                         blink::WebServiceWorkerCacheError reason);
   void OnCacheBatchError(int thread_id,
                          int request_id,
                          blink::WebServiceWorkerCacheError reason);
 
   // 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,
       const blink::WebServiceWorkerCache::QueryParams& query_params);
 
   // These methods are used by WebCache to forward events to the browser
   // 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);
 
   void OnWebCacheDestruction(int cache_id);
 
  private:
   class WebCache;
 
   typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageCallbacks,
                 IDMapOwnPointer> CallbacksMap;
@@ skipping 55 matching lines @@
   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_