content/child/push_messaging/push_provider.cc - Issue 1865913005: Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1865913005: Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 months 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

« no previous file with comments | « content/child/permissions/permission_dispatcher.cc ('k') | content/child/service_worker/service_worker_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a9e79f5cb7db4b8391c6f1623c559ae0476210c6..2062f8c36292b88b9d2b3ed00061d4a5f20c666b 100644

--- a/content/child/push_messaging/push_provider.cc

+++ b/content/child/push_messaging/push_provider.cc

@@ -5,6 +5,7 @@

#include "content/child/push_messaging/push_provider.h"

#include "base/lazy_instance.h"

+#include "base/memory/ptr_util.h"

#include "base/memory/scoped_ptr.h"

#include "base/stl_util.h"

#include "base/threading/thread_local.h"

@@ -161,8 +162,8 @@ void PushProvider::OnSubscribeFromWorkerSuccess(

if (!callbacks)

return;

- callbacks->onSuccess(blink::adoptWebPtr(

- new blink::WebPushSubscription(endpoint, p256dh, auth)));

+ callbacks->onSuccess(

+ base::WrapUnique(new blink::WebPushSubscription(endpoint, p256dh, auth)));

subscription_callbacks_.Remove(request_id);

}

@@ -221,8 +222,8 @@ void PushProvider::OnGetSubscriptionSuccess(