| Index: third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
|
| diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
|
| index f4f1fa2b06e95aaf4d8dede87d96dface23a4da5..9034f9a878fd44d085379b0a5ee00871acf2b779 100644
|
| --- a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
|
| +++ b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
|
| @@ -10,7 +10,7 @@
|
| #include "modules/serviceworkers/ServiceWorkerRegistration.h"
|
| #include "public/platform/modules/push_messaging/WebPushSubscription.h"
|
| #include "wtf/Assertions.h"
|
| -#include "wtf/PtrUtil.h"
|
| +#include <utility>
|
|
|
| namespace blink {
|
|
|
| @@ -27,18 +27,16 @@ PushSubscriptionCallbacks::~PushSubscriptionCallbacks() {}
|
|
|
| void PushSubscriptionCallbacks::onSuccess(
|
| std::unique_ptr<WebPushSubscription> webPushSubscription) {
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
|
|
| - m_resolver->resolve(PushSubscription::take(
|
| - m_resolver.get(), wrapUnique(webPushSubscription.release()),
|
| - m_serviceWorkerRegistration));
|
| + m_resolver->resolve(PushSubscription::take(m_resolver.get(),
|
| + std::move(webPushSubscription),
|
| + m_serviceWorkerRegistration));
|
| }
|
|
|
| void PushSubscriptionCallbacks::onError(const WebPushError& error) {
|
| - if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + if (!m_resolver->getExecutionContext())
|
| return;
|
| m_resolver->reject(PushError::take(m_resolver.get(), error));
|
| }
|
|
|