Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: content/child/push_messaging/push_provider.cc

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/child/push_messaging/push_provider.cc
diff --git a/content/child/push_messaging/push_provider.cc b/content/child/push_messaging/push_provider.cc
index 2f0293ef2345cdf5a652ee90a2070148b4b62bfb..ae2f406dabc4c021512bffdfff7310ccc1591242 100644
--- a/content/child/push_messaging/push_provider.cc
+++ b/content/child/push_messaging/push_provider.cc
@@ -104,7 +104,9 @@ void PushProvider::subscribe(
DCHECK(service_worker_registration);
DCHECK(callbacks);
int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
- subscription_callbacks_.AddWithID(callbacks, request_id);
+ subscription_callbacks_.AddWithID(
+ std::unique_ptr<blink::WebPushSubscriptionCallbacks>(callbacks),
+ request_id);
int64_t service_worker_registration_id =
GetServiceWorkerRegistrationId(service_worker_registration);
PushSubscriptionOptions content_options;
@@ -125,7 +127,9 @@ void PushProvider::unsubscribe(
DCHECK(callbacks);
int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
- unsubscribe_callbacks_.AddWithID(callbacks, request_id);
+ unsubscribe_callbacks_.AddWithID(
+ std::unique_ptr<blink::WebPushUnsubscribeCallbacks>(callbacks),
+ request_id);
int64_t service_worker_registration_id =
GetServiceWorkerRegistrationId(service_worker_registration);
@@ -139,7 +143,9 @@ void PushProvider::getSubscription(
DCHECK(service_worker_registration);
DCHECK(callbacks);
int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
- subscription_callbacks_.AddWithID(callbacks, request_id);
+ subscription_callbacks_.AddWithID(
+ std::unique_ptr<blink::WebPushSubscriptionCallbacks>(callbacks),
+ request_id);
int64_t service_worker_registration_id =
GetServiceWorkerRegistrationId(service_worker_registration);
thread_safe_sender_->Send(new PushMessagingHostMsg_GetSubscription(
@@ -153,7 +159,9 @@ void PushProvider::getPermissionStatus(
DCHECK(service_worker_registration);
DCHECK(callbacks);
int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
- permission_status_callbacks_.AddWithID(callbacks, request_id);
+ permission_status_callbacks_.AddWithID(
+ std::unique_ptr<blink::WebPushPermissionStatusCallbacks>(callbacks),
+ request_id);
int64_t service_worker_registration_id =
GetServiceWorkerRegistrationId(service_worker_registration);
thread_safe_sender_->Send(new PushMessagingHostMsg_GetPermissionStatus(

Powered by Google App Engine
This is Rietveld 408576698