Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/push_messaging/push_messaging_dispatcher.cc

 // 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.
 
 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
 
+#include <memory>
+
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/push_messaging/push_provider.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
@@ skipping 54 matching lines @@
 void PushMessagingDispatcher::DidGetManifest(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
     blink::WebPushSubscriptionCallbacks* callbacks,
     const GURL& manifest_url,
     const Manifest& manifest,
     const ManifestDebugInfo&) {
   // Get the sender_info from the manifest since it wasn't provided by
   // the caller.
   if (manifest.IsEmpty()) {
-    int request_id = subscription_callbacks_.Add(callbacks);
+    int request_id = subscription_callbacks_.Add(
+        std::unique_ptr<blink::WebPushSubscriptionCallbacks>(callbacks));
     OnSubscribeFromDocumentError(
         request_id, PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING);
     return;
   }
 
   PushSubscriptionOptions content_options;
   content_options.user_visible_only = options.userVisibleOnly;
   if (!manifest.gcm_sender_id.is_null()) {
     content_options.sender_info =
         base::UTF16ToUTF8(manifest.gcm_sender_id.string());
   }
 
   DoSubscribe(service_worker_registration, content_options, callbacks);
 }
 
 void PushMessagingDispatcher::DoSubscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const PushSubscriptionOptions& options,
     blink::WebPushSubscriptionCallbacks* callbacks) {
-  int request_id = subscription_callbacks_.Add(callbacks);
+  int request_id = subscription_callbacks_.Add(
+      std::unique_ptr<blink::WebPushSubscriptionCallbacks>(callbacks));
   int64_t service_worker_registration_id =
       static_cast<WebServiceWorkerRegistrationImpl*>(
           service_worker_registration)
           ->registration_id();
 
   if (options.sender_info.empty()) {
     OnSubscribeFromDocumentError(request_id,
                                  PUSH_REGISTRATION_STATUS_NO_SENDER_ID);
     return;
   }
@@ skipping 24 matching lines @@
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
 
   callbacks->onError(PushRegistrationStatusToWebPushError(status));
 
   subscription_callbacks_.Remove(request_id);
 }
 
 }  // namespace content